From 73049cea22e00786e949eb3e4c95659715935fa9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Feb 2004 18:32:42 +0000
Subject: * Ugh.

svn path=/nixpkgs/trunk/; revision=774
---
 .../networking/browsers/firebird/builder.sh        | 30 ----------------------
 .../networking/browsers/firebird/default.nix       | 25 ------------------
 .../networking/browsers/firefox/builder.sh         | 30 ++++++++++++++++++++++
 .../networking/browsers/firefox/default.nix        | 25 ++++++++++++++++++
 4 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100755 pkgs/applications/networking/browsers/firebird/builder.sh
 delete mode 100644 pkgs/applications/networking/browsers/firebird/default.nix
 create mode 100755 pkgs/applications/networking/browsers/firefox/builder.sh
 create mode 100644 pkgs/applications/networking/browsers/firefox/default.nix

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/browsers/firebird/builder.sh b/pkgs/applications/networking/browsers/firebird/builder.sh
deleted file mode 100755
index 36225b5760db..000000000000
--- a/pkgs/applications/networking/browsers/firebird/builder.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-
-buildinputs="$pkgconfig $gtk $perl $zip $libIDL"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd mozilla || exit 1
-
-cat > .mozconfig <<EOF
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
-ac_add_options --enable-optimize=-O2
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
-ac_add_options --enable-xft
-ac_add_options --enable-swg
-ac_add_options --enable-strip
-ac_add_options --enable-default-toolkit=gtk2
-EOF
-echo "ac_add_options --prefix=$out" >> .mozconfig
-
-./configure || exit 1
-make -f client.mk build || exit 1
-make install || exit 1
diff --git a/pkgs/applications/networking/browsers/firebird/default.nix b/pkgs/applications/networking/browsers/firebird/default.nix
deleted file mode 100644
index b17b4a0e4731..000000000000
--- a/pkgs/applications/networking/browsers/firebird/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
-}:
-
-assert !isNull pkgconfig && !isNull gtk && !isNull perl
-  && !isNull zip && !isNull libIDL;
-
-assert libIDL.glib == gtk.glib;
-
-derivation {
-  name = "MozillaFirebird-0.7";
-  system = stdenv.system;
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/firebird/releases/0.7/MozillaFirebird-source-0.7.tar.gz;
-    md5 = "35112566a3dca5bdf363972056afc462";
-  };
-
-  stdenv = stdenv;
-  pkgconfig = pkgconfig;
-  gtk = gtk;
-  perl = perl;
-  zip = zip;
-  libIDL = libIDL;
-}
diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
new file mode 100755
index 000000000000..917cbc513305
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/builder.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $perl $zip $libIDL"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd mozilla || exit 1
+
+cat > .mozconfig <<EOF
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+ac_add_options --enable-crypto
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-mailnews
+ac_add_options --disable-composer
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
+ac_add_options --enable-xft
+ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+EOF
+echo "ac_add_options --prefix=$out" >> .mozconfig
+
+./configure || exit 1
+make -f client.mk build || exit 1
+make install || exit 1
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
new file mode 100644
index 000000000000..9c7a434c63b4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
+}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull perl
+  && !isNull zip && !isNull libIDL;
+
+assert libIDL.glib == gtk.glib;
+
+derivation {
+  name = "firefox-0.8";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2;
+    md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
+  };
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  perl = perl;
+  zip = zip;
+  libIDL = libIDL;
+}
-- 
cgit 1.4.1