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

Work around -lpthread dependencies

Browse Source 
svn path=/nixpkgs/trunk/; revision=24718
This commit is contained in:
Michael Raskin 2010-11-17 08:59:10 +00:00
parent c8b990398a
commit bbcc101bce
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/firefox/4.0.nix
View File

@ -23,8 +23,6 @@ rec {
sha256 = "02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128"; sha256 = "02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128";
}; };
enableParallelBuilding = true;
commonConfigureFlags = commonConfigureFlags =
[ "--enable-optimize" [ "--enable-optimize"
"--disable-debug" "--disable-debug"
@ -43,7 +41,7 @@ rec {
]; ];
xulrunner = stdenv.mkDerivation { xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}"; name = "xulrunner-${xulVersion}";
inherit src; inherit src;
@ -67,6 +65,14 @@ rec {
export NIX_ENFORCE_PURITY= 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"; installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = '' postInstall = ''