summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2005-11-30 05:45:12 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2005-11-30 05:45:12 +0000
commit8e641019001018008388f301472ad807db9b049a (patch)
tree86918ff1b8d9a824e22a815d4b3b3e2e2b7f0908 /pkgs
parent8a6944779a37c4d89580fc4b679d62f9844a3437 (diff)
downloadnixlib-8e641019001018008388f301472ad807db9b049a.tar
nixlib-8e641019001018008388f301472ad807db9b049a.tar.gz
nixlib-8e641019001018008388f301472ad807db9b049a.tar.bz2
nixlib-8e641019001018008388f301472ad807db9b049a.tar.lz
nixlib-8e641019001018008388f301472ad807db9b049a.tar.xz
nixlib-8e641019001018008388f301472ad807db9b049a.tar.zst
nixlib-8e641019001018008388f301472ad807db9b049a.zip
* Idem.
svn path=/nixpkgs/trunk/; revision=4323
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/firefox/builder.sh53
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix17
-rw-r--r--pkgs/applications/networking/browsers/firefox/writable-copies.patch23
3 files changed, 0 insertions, 93 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
deleted file mode 100644
index 31beff80538c..000000000000
--- a/pkgs/applications/networking/browsers/firefox/builder.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-. $stdenv/setup
-
-preConfigure=preConfigure
-preConfigure() {
-    cat > .mozconfig <<EOF
-. \$topsrcdir/browser/config/mozconfig
-ac_add_options --prefix=$out
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-xft
-ac_add_options --disable-freetype2
-#ac_add_options --enable-swg
-ac_add_options --enable-strip
-ac_add_options --enable-default-toolkit=gtk2
-#ac_add_options --disable-shared
-#ac_add_options --enable-static
-#ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-#ac_add_options --with-system-zlib
-EOF
-}
-
-postInstall=postInstall
-postInstall() {
-
-    # Strip some more stuff
-    strip -S $out/lib/*/* || true
-
-    # We don't need this (do we?)
-#    rm -rf $out/include
-
-    # 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.
-    cd $out/bin
-    mv firefox ../lib/firefox-*/
-    ln -s ../lib/firefox-*/firefox .
-
-    # Register extension etc.
-    echo "running firefox -register..."
-    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
-
-    echo "running regxpcom..."
-    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
-    
-    echo "running regchrome..."
-    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
-    
-}
-
-makeFlags="-f client.mk build"
-
-genericBuild
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
deleted file mode 100644
index 7f1660a72798..000000000000
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
-
-# !!! assert libIDL.glib == gtk.glib;
-
-(stdenv.mkDerivation {
-  name = "firefox-1.0.7";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2;
-    md5 = "5704a8c36de84b408e069afb0c5bc1df";
-  };
-
-  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
-
-  patches = [./writable-copies.patch];
-}) // {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 e3c7752c0310..000000000000
--- 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