From f677edf57f71cf0c8c9e0906d26b4304e4213ef8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Jun 2012 14:35:56 +0000 Subject: [PATCH] * Firefox 13.0. It's not stable yet though - it seems to hang the first time a Flash control is loaded, with the following message on stderr: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: symbol lookup error: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: undefined symbol: malloc_message Need to investigate where malloc_message is defined. svn path=/nixpkgs/trunk/; revision=34368 --- .../networking/browsers/firefox/10.0.nix | 181 ------------------ .../browsers/firefox/{11.0.nix => 13.0.nix} | 14 +- pkgs/top-level/all-packages.nix | 14 +- pkgs/top-level/release.nix | 3 +- 4 files changed, 14 insertions(+), 198 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/10.0.nix rename pkgs/applications/networking/browsers/firefox/{11.0.nix => 13.0.nix} (94%) diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix deleted file mode 100644 index ff16cad0ee1232..00000000000000 --- a/pkgs/applications/networking/browsers/firefox/10.0.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "10.0.2"; - - xulVersion = "10.0.2"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "d9b459d915d4638a48b3e249fcbaf7cafc27e834"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite unzip - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # 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])) - }' ';' - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done; - for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite file unzip - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # 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])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/11.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix similarity index 94% rename from pkgs/applications/networking/browsers/firefox/11.0.nix rename to pkgs/applications/networking/browsers/firefox/13.0.nix index 28f0f476833c98..8b1ab901c236f0 100644 --- a/pkgs/applications/networking/browsers/firefox/11.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "11.0"; + firefoxVersion = "13.0"; - xulVersion = "11.0"; # this attribute is used by other packages + xulVersion = "13.0"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - md5 = "4b07acf47857aff72776d805409cdd1b"; + sha1 = "f90608874a54883b9fbb90b8d6dd3dc75a305572"; }; commonConfigureFlags = @@ -35,7 +35,7 @@ rec { "--with-system-nspr" # "--with-system-nss" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old "--enable-system-sqlite" "--disable-crashreporter" "--disable-tests" @@ -75,7 +75,11 @@ rec { }' ';' export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ # !!! Temporary hack. preBuild = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb577caf7b22b..e6b441be52361c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6709,23 +6709,17 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix { - inherit (gnome) libIDL; - }; - - firefox10Wrapper = wrapFirefox { browser = firefox10Pkgs.firefox; }; - - firefox11Pkgs = callPackage ../applications/networking/browsers/firefox/11.0.nix { + firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix { inherit (gnome) libIDL; }; - firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; }; + firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; }; - firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix { + firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { inherit (gnome) libIDL; }; - firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; }; + firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index aff1dd9ce9c6b6..18bad093294c44 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -360,9 +360,8 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox10Pkgs.firefox = linux; - firefox11Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; + firefox13Pkgs.firefox = linux; gnome = { gnome_panel = linux;