diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
| commit | 8c4aeb17808e6d33515bb9178eaca942c588b31d (patch) | |
| tree | 202a33b2dd86ab28d168778b313f184a9ecc0bda /lib | |
| parent | 003ab1d9fdaf2818a1e5a6e53825d31ac2e23621 (diff) | |
| parent | 838c75398cc46cf2acbe144b1f3866d736abe430 (diff) | |
| download | nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.gz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.bz2 nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.lz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.xz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.zst nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.zip | |
Merge staging into master
Brings in:
- changed output order for multiple outputs:
https://github.com/NixOS/nixpkgs/pull/14766
- audit disabled by default
https://github.com/NixOS/nixpkgs/pull/17916
Conflicts:
pkgs/development/libraries/openldap/default.nix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attrsets.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index f47e481c58a4..686e125f100c 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -454,6 +454,8 @@ rec { getLib = getOutput "lib"; 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; /*** deprecated stuff ***/ |