Author: raskin
Date: Wed Nov 17 08:59:10 2010
New Revision: 24718
URL: https://svn.nixos.org/websvn/nix/?rev=24718&sc=1
Log:
Work around -lpthread dependencies
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Wed Nov
17 00:21:50 2010 (r24717)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Wed Nov
17 08:59:10 2010 (r24718)
@@ -23,8 +23,6 @@
sha256 =
"02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128";
};
- enableParallelBuilding = true;
-
commonConfigureFlags =
[ "--enable-optimize"
"--disable-debug"
@@ -43,7 +41,7 @@
];
- xulrunner = stdenv.mkDerivation {
+ xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
@@ -67,6 +65,14 @@
export NIX_ENFORCE_PURITY=
'';
+ # Hack to work around make's idea of -lbz2 dependency
+ preConfigure = ''
+ find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+ stdenv.lib.concatStringsSep ":"
+ (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+ }' ';'
+ '';
+
installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
