JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake2_8: use get(Output) functions

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-25 13:21:15 +03:00
parent 5ede7d4d92
commit 96a5c34bc5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/build-managers/cmake/2.8.nix
View File

@ -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 = {