From afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 8 Mar 2015 17:28:44 -0500 Subject: [PATCH] autonix: allow one-to-many dependency resolution --- pkgs/build-support/autonix/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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