Use nix from nixpkgs (not from PATH) to avoid nixUnstable

[pinch] / default.nix

diff --git a/default.nix b/default.nix
index e8b71283d38212dd4876afde1a3dce8c6894f50a..8c8fbd31e47b708f726cdf82b92b415e636beb6e 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -34,14 +34,18 @@ let
       checkPhase = "./test.sh";
     };
 
       checkPhase = "./test.sh";
     };
 

-in pkgs.python3Packages.callPackage
-({ lib, buildPythonPackage, nix, git, autopep8, mypy, pylint, git-cache, }:
+in pkgs.python3Packages.callPackage ({ lib, buildPythonPackage, nix, git
+  , autopep8, makeWrapper, mypy, pylint, git-cache, }:

   buildPythonPackage rec {
     pname = "pinch";
   buildPythonPackage rec {
     pname = "pinch";

-    version = "3.0.1-pre";
+    version = "3.0.4-pre";

     src = lib.cleanSource ./.;
     src = lib.cleanSource ./.;

+    buildInputs = [ makeWrapper ];

     propagatedBuildInputs = [ git-cache ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];
     propagatedBuildInputs = [ git-cache ];
     checkInputs = [ nix git mypy ] ++ lib.optionals lint [ autopep8 pylint ];

+    postInstall = ''
+      wrapProgram "$out/bin/pinch" --prefix PATH : ${nix}/bin
+    '';

     doCheck = true;
     checkPhase = "./test.sh";
   }) {
     doCheck = true;
     checkPhase = "./test.sh";
   }) {