diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 12:43:37 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 12:43:37 +0300 |
| commit | d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41 (patch) | |
| tree | 3fd2e86b20f4251fa91ace5efb393ee66700fbb8 /pkgs/development/tools/build-managers | |
| parent | e6f1028340d7ab1c485efccbbbbaec4b9cb5712a (diff) | |
| parent | 03fb2c1f32825dd7d43a456667db5848b47f4ea3 (diff) | |
| download | nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.gz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.bz2 nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.lz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.xz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.zst nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.zip | |
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
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" |