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 /pkgs/development/tools/build-managers | |
| 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 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/2.8.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 885e10b465ae..3191d8293ef2 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; CMAKE_PREFIX_PATH = concatStringsSep ":" - (concatMap (p: [ p p.out ]) buildInputs); + (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); configureFlags = "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" |