diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/20.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix index 1480a300820c..3b2f9962a32c 100644 --- a/pkgs/applications/networking/browsers/firefox/20.0.nix +++ b/pkgs/applications/networking/browsers/firefox/20.0.nix @@ -35,7 +35,7 @@ rec { #"--enable-profiling" "--disable-debug" "--enable-strip" - # "--with-system-jpeg" # Too old in nixpkgs + "--with-system-jpeg" # now we use recent libjpeg-turbo "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index 5587f3b732ce..7cb1abf31537 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's@/usr/bin/@@g' -i configure sed -e '/gthread[.]h/d' -i src/npw-player.c + export NIX_LDFLAGS="$NIX_LDFLAGS -lgthread-2.0" export configureFlags="$configureFlags --target-cpu=$(uname -m)" ''; |