From 060f8629f9fae476b2a8d5dd07081f0404372175 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jul 2009 14:26:24 +0000 Subject: [PATCH] * Refactor the Firefox directories a bit. svn path=/nixpkgs/trunk/; revision=16143 --- .../builder.sh => firefox/2.0-builder.sh} | 0 .../{firefox-2/default.nix => firefox/2.0.nix} | 3 ++- .../{firefox-3/default.nix => firefox/3.0.nix} | 0 .../browsers/{firefox-3 => firefox}/3.5.nix | 0 .../browsers/{firefox-3 => firefox}/binary.nix | 0 .../default.nix => firefox/wrapper.nix} | 0 .../{firefox-2 => firefox}/writable-copies.patch | 0 .../browsers/{firefox-2 => firefox}/xlibs.patch | 0 .../{firefox-3 => firefox}/xulrunner-3.5.nix | 0 .../browsers/{firefox-3 => firefox}/xulrunner.nix | 0 pkgs/top-level/all-packages.nix | 14 +++++++------- 11 files changed, 9 insertions(+), 8 deletions(-) rename pkgs/applications/networking/browsers/{firefox-2/builder.sh => firefox/2.0-builder.sh} (100%) rename pkgs/applications/networking/browsers/{firefox-2/default.nix => firefox/2.0.nix} (98%) rename pkgs/applications/networking/browsers/{firefox-3/default.nix => firefox/3.0.nix} (100%) rename pkgs/applications/networking/browsers/{firefox-3 => firefox}/3.5.nix (100%) rename pkgs/applications/networking/browsers/{firefox-3 => firefox}/binary.nix (100%) rename pkgs/applications/networking/browsers/{firefox-wrapper/default.nix => firefox/wrapper.nix} (100%) rename pkgs/applications/networking/browsers/{firefox-2 => firefox}/writable-copies.patch (100%) rename pkgs/applications/networking/browsers/{firefox-2 => firefox}/xlibs.patch (100%) rename pkgs/applications/networking/browsers/{firefox-3 => firefox}/xulrunner-3.5.nix (100%) rename pkgs/applications/networking/browsers/{firefox-3 => firefox}/xulrunner.nix (100%) diff --git a/pkgs/applications/networking/browsers/firefox-2/builder.sh b/pkgs/applications/networking/browsers/firefox/2.0-builder.sh similarity index 100% rename from pkgs/applications/networking/browsers/firefox-2/builder.sh rename to pkgs/applications/networking/browsers/firefox/2.0-builder.sh diff --git a/pkgs/applications/networking/browsers/firefox-2/default.nix b/pkgs/applications/networking/browsers/firefox/2.0.nix similarity index 98% rename from pkgs/applications/networking/browsers/firefox-2/default.nix rename to pkgs/applications/networking/browsers/firefox/2.0.nix index e557743aacad..1d3fccefc06c 100644 --- a/pkgs/applications/networking/browsers/firefox-2/default.nix +++ b/pkgs/applications/networking/browsers/firefox/2.0.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { name = "firefox-2.0.0.20"; - builder = ./builder.sh; + builder = ./2.0-builder.sh; + src = fetchurl { url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/source/firefox-2.0.0.20-source.tar.bz2; sha1 = "16601fdbbb0a83b85fd053e76350f7da397f525e"; diff --git a/pkgs/applications/networking/browsers/firefox-3/default.nix b/pkgs/applications/networking/browsers/firefox/3.0.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox-3/default.nix rename to pkgs/applications/networking/browsers/firefox/3.0.nix diff --git a/pkgs/applications/networking/browsers/firefox-3/3.5.nix b/pkgs/applications/networking/browsers/firefox/3.5.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox-3/3.5.nix rename to pkgs/applications/networking/browsers/firefox/3.5.nix diff --git a/pkgs/applications/networking/browsers/firefox-3/binary.nix b/pkgs/applications/networking/browsers/firefox/binary.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox-3/binary.nix rename to pkgs/applications/networking/browsers/firefox/binary.nix diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox-wrapper/default.nix rename to pkgs/applications/networking/browsers/firefox/wrapper.nix diff --git a/pkgs/applications/networking/browsers/firefox-2/writable-copies.patch b/pkgs/applications/networking/browsers/firefox/writable-copies.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox-2/writable-copies.patch rename to pkgs/applications/networking/browsers/firefox/writable-copies.patch diff --git a/pkgs/applications/networking/browsers/firefox-2/xlibs.patch b/pkgs/applications/networking/browsers/firefox/xlibs.patch similarity index 100% rename from pkgs/applications/networking/browsers/firefox-2/xlibs.patch rename to pkgs/applications/networking/browsers/firefox/xlibs.patch diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix b/pkgs/applications/networking/browsers/firefox/xulrunner-3.5.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix rename to pkgs/applications/networking/browsers/firefox/xulrunner-3.5.nix diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix b/pkgs/applications/networking/browsers/firefox/xulrunner.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox-3/xulrunner.nix rename to pkgs/applications/networking/browsers/firefox/xulrunner.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edaa456a866f..802e6f9eea8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6243,7 +6243,7 @@ let firefoxWrapper = firefox3Wrapper; - firefox2 = lowPrio (import ../applications/networking/browsers/firefox-2 { + firefox2 = lowPrio (import ../applications/networking/browsers/firefox/2.0.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo; inherit (gtkLibs) gtk; inherit (gnome) libIDL; @@ -6253,7 +6253,7 @@ let firefox2Wrapper = wrapFirefox firefox2 "firefox" ""; - firefox3 = lowPrio (import ../applications/networking/browsers/firefox-3 { + firefox3 = lowPrio (import ../applications/networking/browsers/firefox/3.0.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo python dbus dbus_glib freetype fontconfig bzip2; inherit (gtkLibs) gtk pango; @@ -6262,7 +6262,7 @@ let xulrunner = xulrunner3; }); - xulrunner3 = lowPrio (import ../applications/networking/browsers/firefox-3/xulrunner.nix { + xulrunner3 = lowPrio (import ../applications/networking/browsers/firefox/xulrunner.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs file; inherit (gtkLibs) gtk pango; @@ -6270,7 +6270,7 @@ let #enableOfficialBranding = true; }); - firefox3_5 = lowPrio (import ../applications/networking/browsers/firefox-3/3.5.nix { + firefox3_5 = lowPrio (import ../applications/networking/browsers/firefox/3.5.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo python dbus dbus_glib freetype fontconfig bzip2; inherit (gtkLibs) gtk pango; @@ -6281,7 +6281,7 @@ let autoconf = autoconf213; }); - xulrunner3_5 = lowPrio (import ../applications/networking/browsers/firefox-3/xulrunner-3.5.nix { + xulrunner3_5 = lowPrio (import ../applications/networking/browsers/firefox/xulrunner-3.5.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs file; inherit (gtkLibs) gtk pango; @@ -6291,7 +6291,7 @@ let #enableOfficialBranding = true; }); - firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox-3/binary.nix { + firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox/binary.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo python curl coreutils freetype fontconfig; inherit (gtkLibs) gtk atk pango glib; @@ -7164,7 +7164,7 @@ let inherit stdenv fetchurl tcl tk x11 makeWrapper; }; - wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { + wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName; plugins = let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;