* 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
nbp · Jun 6, 2012 · f677edf · f677edf
1 parent 43bc388
commit f677edf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 198 deletions.
diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix
diff --git a/...ions/networking/browsers/firefox/11.0.nix → ...ions/networking/browsers/firefox/13.0.nix b/...ions/networking/browsers/firefox/11.0.nix → ...ions/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
@@ -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
@@ -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;