Author: raskin
Date: Sat Apr 9 15:50:33 2011
New Revision: 26765
URL: https://svn.nixos.org/websvn/nix/?rev=26765&sc=1
Log:
Fix cmake flags overriding
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Sat Apr
9 14:59:06 2011 (r26764)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Sat Apr
9 15:50:33 2011 (r26765)
@@ -384,12 +384,14 @@
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);
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
