diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:21:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:24:40 +0300 |
| commit | 96a5c34bc5736780f84a62e682c59da50e531f0e (patch) | |
| tree | 103d02f53d77788735d95fbda5b86380c24ef7d3 /pkgs/development/tools | |
| parent | 5ede7d4d925542da9315b659afbe16b90613414e (diff) | |
| download | nixpkgs-96a5c34bc5736780f84a62e682c59da50e531f0e.tar nixpkgs-96a5c34bc5736780f84a62e682c59da50e531f0e.tar.gz nixpkgs-96a5c34bc5736780f84a62e682c59da50e531f0e.tar.bz2 nixpkgs-96a5c34bc5736780f84a62e682c59da50e531f0e.tar.lz nixpkgs-96a5c34bc5736780f84a62e682c59da50e531f0e.tar.xz nixpkgs-96a5c34bc5736780f84a62e682c59da50e531f0e.tar.zst nixpkgs-96a5c34bc5736780f84a62e682c59da50e531f0e.zip | |
cmake2_8: use get(Output) functions
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/2.8.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 6542c9ae3c5..885e10b465a 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" + CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ p p.out ]) buildInputs); configureFlags = @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { source $setupHook fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${glibc.bin or glibc} \ - --subst-var-by glibc_dev ${glibc.dev or glibc} \ - --subst-var-by glibc_lib ${glibc.out or glibc} + --subst-var-by glibc_bin ${getBin glibc} \ + --subst-var-by glibc_dev ${getDev glibc} \ + --subst-var-by glibc_lib ${getLib glibc} ''; meta = { |