Merge commit 'e0b5eef' from staging into master

2016-09-12 13:21:45 +03:00
parent 38f074435a e0b5eef4e7
commit 49f4ba7ae0
2 changed files with 16 additions and 5 deletions
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -455,7 +455,7 @@ rec {
  getDev = getOutput "dev";

  /* Pick the outputs of packages to place in buildInputs */
-  chooseDevOutputs = drvs: builtins.map (drv: if drv.outputUnspecified or false then drv.dev or drv else drv) drvs;
+  chooseDevOutputs = drvs: builtins.map getDev drvs;

  /*** deprecated stuff ***/