Merge pull request #307 from deemp/fix-packagesFrom

Fix packagesFrom
numtide · Apr 19, 2024 · 12e9147 · 12e9147
2 parents 2c8e04e + 6dee0dd
commit 12e9147
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/modules/devshell.nix b/modules/devshell.nix
@@ -216,10 +216,11 @@ let
 
   # Returns a list of all the input derivation ... for a derivation.
   inputsOf = drv:
-    (drv.buildInputs or [ ]) ++
-    (drv.nativeBuildInputs or [ ]) ++
-    (drv.propagatedBuildInputs or [ ]) ++
-    (drv.propagatedNativeBuildInputs or [ ])
+    filter lib.isDerivation
+      ((drv.buildInputs or [ ]) ++
+        (drv.nativeBuildInputs or [ ]) ++
+        (drv.propagatedBuildInputs or [ ]) ++
+        (drv.propagatedNativeBuildInputs or [ ]))
   ;
 
 in

diff --git a/tests/core/devshell.nix b/tests/core/devshell.nix
@@ -6,6 +6,9 @@
       shell = devshell.mkShell {
         devshell.name = "devshell-1";
         devshell.packages = [ pkgs.git ];
+        devshell.packagesFrom = [
+          (pkgs.hello.overrideAttrs { buildInputs = [ null pkgs.cowsay ]; })
+        ];
       };
     in
     runTest "devshell-1" { } ''
@@ -20,6 +23,9 @@
 
       # Adds packages to the PATH
       type -p git
+      
+      # Adds packages from packagesFrom to the PATH
+      type -p cowsay
     '';
 
   # Only load profiles