From bbcc101bcee2f90ea1b9c3b0a8067c2b328ffdc3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 17 Nov 2010 08:59:10 +0000
Subject: [PATCH] Work around -lpthread dependencies

svn path=/nixpkgs/trunk/; revision=24718
---
 .../applications/networking/browsers/firefox/4.0.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/4.0.nix
index e2122b1d9893..4ced191142af 100644
--- a/pkgs/applications/networking/browsers/firefox/4.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/4.0.nix
@@ -23,8 +23,6 @@ rec {
     sha256 = "02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128";
   };
 
-  enableParallelBuilding = true;
-
   commonConfigureFlags =
     [ "--enable-optimize"
       "--disable-debug"
@@ -43,7 +41,7 @@ rec {
     ];
 
 
-  xulrunner = stdenv.mkDerivation {
+  xulrunner = stdenv.mkDerivation rec {
     name = "xulrunner-${xulVersion}";
     
     inherit src;
@@ -67,6 +65,14 @@ rec {
      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 = ''