summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-03-08 17:28:44 -0500
committerThomas Tuegel <ttuegel@gmail.com>2015-03-08 17:28:44 -0500
commitafa4c3aed2d75636eba1dd5f3e63388d2b9a73d2 (patch)
treec061c2a28dae1eb2aab852a4fd10af9a6f9111df /pkgs/build-support
parent32ee876647124410c16a26162f555a3f498c07fd (diff)
downloadnixlib-afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2.tar
nixlib-afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2.tar.gz
nixlib-afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2.tar.bz2
nixlib-afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2.tar.lz
nixlib-afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2.tar.xz
nixlib-afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2.tar.zst
nixlib-afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2.zip
autonix: allow one-to-many dependency resolution
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/autonix/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix
index 66e2700f192a..02862abca498 100644
--- a/pkgs/build-support/autonix/default.nix
+++ b/pkgs/build-support/autonix/default.nix
@@ -146,7 +146,11 @@ let
 
   mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; });
 
-  resolveDeps = scope: map (dep: scope."${dep}" or null);
+  resolveDeps = scope:
+    let resolveDeps_go = dep:
+          let res = scope."${dep}" or [];
+          in if isList res then res else [res];
+    in concatMap resolveDeps_go;
 
   userEnvPkg = dep:
     mapAttrs