alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix cmake flags overriding

Browse source 
svn path=/nixpkgs/trunk/; revision=26765
This commit is contained in:
Michael Raskin 2011-04-09 15:50:33 +00:00
parent ccd2316471
commit 1886fad9f1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/builder-defs/builder-defs.nix
View file

@ -384,12 +384,14 @@ let inherit (builtins) head tail trace; in
echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
") ["minInit" "defEnsureDir"];
cmakeFlags = "-DCMAKE_SKIP_BUILD_RPATH=ON";
cmakeFlags = attrByPath ["cmakeFlags"] [] args;
cmakeRPathFlag = if (attrByPath ["cmakeSkipRpath "] true args) then " -DCMAKE_SKIP_BUILD_RPATH=ON " else "";
doCmake = fullDepEntry (''
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX="$out" ${toString cmakeFlags} ..
cmake -D CMAKE_INSTALL_PREFIX="$out" ${cmakeRPathFlag}${toString cmakeFlags} ..
'') ["minInit" "addInputs" "doUnpack"];
/*debug = x:(trace x x);