Author: viric
Date: Wed Mar 30 22:08:29 2011
New Revision: 26617
URL: https://svn.nixos.org/websvn/nix/?rev=26617&sc=1
Log:
Making builder-defs doCMake build well the shared libraries and binaries (rpath
related).
I simply made it do what the cmake setup-hook already said to do.
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 Wed Mar
30 22:08:25 2011 (r26616)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Wed Mar
30 22:08:29 2011 (r26617)
@@ -384,7 +384,7 @@
echo '${toString (attrByPath ["propagatedBuildInputs"] []
args)}' >\$out/nix-support/propagated-build-inputs
") ["minInit" "defEnsureDir"];
- cmakeFlags = "";
+ cmakeFlags = "-DCMAKE_SKIP_BUILD_RPATH=ON";
doCmake = fullDepEntry (''
mkdir build
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
