From f7b32f6bde0b87c0f9904eb7459a5062a8398a46 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Oct 2006 08:06:18 +0000 Subject: [PATCH] * Firefox 2.0. svn path=/nixpkgs/trunk/; revision=6816 --- .../browsers/firefox-2.0/default.nix | 6 +-- .../networking/browsers/firefox/builder.sh | 30 ------------ .../networking/browsers/firefox/default.nix | 49 ------------------- .../browsers/firefox/writable-copies.patch | 23 --------- pkgs/top-level/all-packages.nix | 10 +--- 5 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/builder.sh delete mode 100644 pkgs/applications/networking/browsers/firefox/default.nix delete mode 100644 pkgs/applications/networking/browsers/firefox/writable-copies.patch diff --git a/pkgs/applications/networking/browsers/firefox-2.0/default.nix b/pkgs/applications/networking/browsers/firefox-2.0/default.nix index 12a666481e1..0f348d8a2f4 100644 --- a/pkgs/applications/networking/browsers/firefox-2.0/default.nix +++ b/pkgs/applications/networking/browsers/firefox-2.0/default.nix @@ -10,12 +10,12 @@ }: stdenv.mkDerivation { - name = "firefox-2.0-pre-rc1"; + name = "firefox-2.0"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/firefox-2.0rc1-source.tar.bz2; - sha1 = "0f6bcab71becb4fb92900fc900b20301434f4e00"; + url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0/source/firefox-2.0-source.tar.bz2; + sha1 = "2bbc6b80cf184bf27101ec4315a19023547c85d4"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh deleted file mode 100644 index 66f1059d657..00000000000 --- a/pkgs/applications/networking/browsers/firefox/builder.sh +++ /dev/null @@ -1,30 +0,0 @@ -source $stdenv/setup - -postInstall=postInstall -postInstall() { - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # This fixes starting Firefox when there already is a running - # instance. The `firefox' wrapper script actually expects to be - # in the same directory as `run-mozilla.sh', apparently. - libDir=$(cd $out/lib && ls -d firefox-*) - test -n "$libDir" - cd $out/bin - mv firefox ../lib/$libDir/ - ln -s ../lib/$libDir/firefox . - - # Register extensions etc. - echo "running firefox -register..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false - - echo "running regxpcom..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false - - # Put the Firefox icon in the right place. - ensureDir $out/lib/$libDir/chrome/icons/default - ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/ -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix deleted file mode 100644 index 8fe658def71..00000000000 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi -, libjpeg, libpng, zlib, cairo - -, # If you want the resulting program to call itself "Firefox" instead - # of "Deer Park", 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 - -}: - -stdenv.mkDerivation { - name = "firefox-1.5.0.7"; - - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/firefox-1.5.0.7-source.tar.bz2; - sha1 = "f10d57af87bddc1b929ec5321688ac0efa880960"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo - ]; - - patches = [./writable-copies.patch]; - - configureFlags = [ - "--enable-application=browser" - "--enable-optimize" - "--disable-debug" - "--enable-xft" - "--disable-freetype2" - "--enable-svg" - "--enable-canvas" - "--enable-strip" - "--enable-default-toolkit=gtk2" - "--with-system-jpeg" - "--with-system-png" - "--with-system-zlib" - "--enable-system-cairo" - ] - ++ (if enableOfficialBranding then ["--enable-official-branding"] else []); - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - }; - - passthru = {inherit gtk;}; -} diff --git a/pkgs/applications/networking/browsers/firefox/writable-copies.patch b/pkgs/applications/networking/browsers/firefox/writable-copies.patch deleted file mode 100644 index e3c7752c031..00000000000 --- a/pkgs/applications/networking/browsers/firefox/writable-copies.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -rc mozilla-orig/xpcom/io/nsLocalFileUnix.cpp mozilla/xpcom/io/nsLocalFileUnix.cpp -*** mozilla-orig/xpcom/io/nsLocalFileUnix.cpp 2004-04-03 01:48:18.000000000 +0200 ---- mozilla/xpcom/io/nsLocalFileUnix.cpp 2004-10-05 19:48:04.000000000 +0200 -*************** -*** 634,639 **** ---- 634,640 ---- - // get the dirs old permissions - if (NS_FAILED(rv = GetPermissions(&oldPerms))) - return rv; -+ oldPerms |= 0200; - if (NS_FAILED(rv = newParent->Create(DIRECTORY_TYPE, oldPerms))) - return rv; - } else { // dir exists lets try to use leaf -*************** -*** 758,763 **** ---- 759,765 ---- - // get the old permissions - PRUint32 myPerms; - GetPermissions(&myPerms); -+ myPerms |= 0200; - - // Create the new file with the old file's permissions, even if write - // permission is missing. We can't create with write permission and diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1ea1b2856b..64eb6a201cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2369,15 +2369,7 @@ rec { inherit (gtkLibs) glib; }; - firefox = import ../applications/networking/browsers/firefox { - inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo; - inherit (gtkLibs) gtk; - inherit (gnome) libIDL; - inherit (xlibs) libXi; - #enableOfficialBranding = true; - }; - - firefox20 = import ../applications/networking/browsers/firefox-2.0 { + firefox = import ../applications/networking/browsers/firefox-2.0 { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo; inherit (gtkLibs) gtk; inherit (gnome) libIDL;