feat: use drvSrc argument

xeredo-solar · Jan 29, 2021 · e67750b · e67750b
1 parent 5fb959b
commit e67750b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,5 +20,5 @@ result*
 buildconfig.rs
 installer.log
 
-# this is a library not an app, so it should work accross most versions
+# this ensures the version we are using is a random one, so we can ensure it works as it should anywhere
 flake.lock
diff --git a/package.nix b/package.nix
@@ -18,10 +18,10 @@
 , makeWrapper
 , nixpkgs
 , conf-tool
-, shellHookAppend ? "" # only used by shell.nix to add channels to NIX_PATH
 , nixDistinst ? nixFlakes
 , makeRustPlatform
 , system
+, drvSrc ? ./.
 }:
 
 let
@@ -78,7 +78,7 @@ with rust; (makeRustPlatform packages.stable).buildRustPackage rec {
   pname = "distinst";
   version = "0.0.1";
 
-  src = ./.;
+  src = drvSrc;
 
   cargoSha256 = "sha256-0JZrFJ/b+HHZyyVjppX1dcjiN4YSz6FakfONZxSAeT8=";
 
@@ -141,7 +141,6 @@ with rust; (makeRustPlatform packages.stable).buildRustPackage rec {
   shellHook = ''
     ${preBuild}
     export PATH="${lib.makeBinPath tools}:$PATH"
-    ${shellHookAppend}
   '';
 
   doCheck = false;