From f12a3abf4b7722fdee444075eba8d8608f6d4523 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Jul 2009 14:52:50 +0000 Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=16165 --- .../networking/browsers/firefox-3/3.1.nix | 84 --------------- .../networking/browsers/firefox-3/3.5.nix | 83 -------------- .../networking/browsers/firefox-3/binary.nix | 55 ---------- .../networking/browsers/firefox-3/default.nix | 71 ------------ .../browsers/firefox-3/xulrunner-3.1.nix | 96 ----------------- .../browsers/firefox-3/xulrunner-3.5.nix | 102 ------------------ .../browsers/firefox-3/xulrunner.nix | 87 --------------- 7 files changed, 578 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox-3/3.1.nix delete mode 100644 pkgs/applications/networking/browsers/firefox-3/3.5.nix delete mode 100644 pkgs/applications/networking/browsers/firefox-3/binary.nix delete mode 100644 pkgs/applications/networking/browsers/firefox-3/default.nix delete mode 100644 pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix delete mode 100644 pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix delete mode 100644 pkgs/applications/networking/browsers/firefox-3/xulrunner.nix diff --git a/pkgs/applications/networking/browsers/firefox-3/3.1.nix b/pkgs/applications/networking/browsers/firefox-3/3.1.nix deleted file mode 100644 index ef40ac0c7d3..00000000000 --- a/pkgs/applications/networking/browsers/firefox-3/3.1.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, cairo, dbus, dbus_glib, bzip2 -, freetype, fontconfig, xulrunner, alsaLib, autoconf - -, # 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-3.1b2"; - - src = fetchurl { - url = ftp://ftp.mozilla.org/pub/firefox/releases/3.1b2/source/firefox-3.1b2-source.tar.bz2; - sha256 = "1mqy7q4bfw8iphlmzvymqfki8r4zzynyyy6z6gws4qqx9ry42jqs"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig alsaLib - autoconf - ]; - - propagatedBuildInputs = [xulrunner]; - - preConfigure = '' - export PREFIX=$out - export LIBXUL_DIST=$out - autoconf - cd js/src - autoconf - cd ../.. - ''; - - preBuild = '' - cd nsprpub - autoconf - ./configure - make - cd .. - ''; - - configureFlags = [ - "--enable-application=browser" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - ]; - - postInstall = '' - # Strip some more stuff. - strip -S $out/lib/*/* || true - - libDir=$(cd $out/lib && ls -d firefox-[0-9]*) - test -n "$libDir" - - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner - - # Register extensions etc. !!! is this needed anymore? - echo "running firefox -register..." - $out/bin/firefox -register - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk; - isFirefox3Like = true; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox-3/3.5.nix b/pkgs/applications/networking/browsers/firefox-3/3.5.nix deleted file mode 100644 index 09f2eabe541..00000000000 --- a/pkgs/applications/networking/browsers/firefox-3/3.5.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, cairo, dbus, dbus_glib, bzip2 -, freetype, fontconfig, xulrunner, alsaLib, autoconf - -, # 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 - -}: - -let version = xulrunner.ffversion; in - -stdenv.mkDerivation { - name = "firefox-${version}"; - - src = xulrunner.src; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig alsaLib - autoconf - ]; - - propagatedBuildInputs = [xulrunner]; - - preConfigure = '' - export PREFIX=$out - export LIBXUL_DIST=$out - autoconf - cd js/src - autoconf - cd ../.. - ''; - - preBuild = '' - cd nsprpub - autoconf - ./configure - make - cd .. - ''; - - configureFlags = [ - "--enable-application=browser" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - ]; - - postInstall = '' - # Strip some more stuff. - strip -S $out/lib/*/* || true - - libDir=$(cd $out/lib && ls -d firefox-[0-9]*) - test -n "$libDir" - - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner - - # Register extensions etc. !!! is this needed anymore? - echo "running firefox -register..." - $out/bin/firefox -register - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk; - isFirefox3Like = true; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox-3/binary.nix b/pkgs/applications/networking/browsers/firefox-3/binary.nix deleted file mode 100644 index 73e002435b8..00000000000 --- a/pkgs/applications/networking/browsers/firefox-3/binary.nix +++ /dev/null @@ -1,55 +0,0 @@ -args: with args; - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "firefox-3b1"; - - src = - fetchurl { - url = ftp://ftp.mozilla.org/pub/firefox/releases/3.0b1/linux-i686/en-US/firefox-3.0b1.tar.bz2; - sha256 = "1cpcc5b07zdqyd5kiwhb4dqhy2mzbf97plsglcp6bc9054cmsylk"; - }; - buildInputs = [ - pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo - python curl coreutils atk pango glib libX11 libXrender - freetype fontconfig libXft libXt - ]; - - buildPhase = " - additionalRpath=''; - for i in \$buildInputs ${stdenv.glibc} ${stdenv.gcc.gcc}; do - additionalRpath=\$additionalRpath:\$i/lib; - done - for i in firefox-bin ; do - oldrpath=$(patchelf --print-rpath \$i) - patchelf --set-rpath \$oldrpath\$additionalRpath \$i - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \$i - done - "; - - installPhase = " - export dontPatchELF=1; - mkdir -p \$out - cp -r . \$out/firefox - mkdir -p \$out/bin - ln -s \$out/firefox/firefox \$out/bin/firefox - - sed -e 's@moz_libdir=.*@moz_libdir='\$out'/firefox/@' -i \$out/bin/firefox - sed -e 's@moz_libdir=.*@&\\nexport PATH=\$PATH:${coreutils}/bin@' -i \$out/bin/firefox - sed -e 's@`/bin/pwd@`${coreutils}/bin/pwd@' -i \$out/bin/firefox - sed -e 's@`/bin/ls@`${coreutils}/bin/ls@' -i \$out/bin/firefox - - strip -S \$out/firefox/*.so || true - - echo \"running firefox -register...\" - \$out/firefox/firefox-bin -register || false - "; - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - }; - - passthru = {inherit gtk;}; -} - diff --git a/pkgs/applications/networking/browsers/firefox-3/default.nix b/pkgs/applications/networking/browsers/firefox-3/default.nix deleted file mode 100644 index 4743d71ef50..00000000000 --- a/pkgs/applications/networking/browsers/firefox-3/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, cairo, dbus, dbus_glib, bzip2 -, freetype, fontconfig, xulrunner - -, # 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 rec { - name = "firefox-${version}"; - - version = "3.0.11"; - - src = fetchurl { - # Don't forget to update xulrunner.nix as well! - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}-source.tar.bz2"; - sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = [ - "--enable-application=browser" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - ]; - - postInstall = '' - # Strip some more stuff. - strip -S $out/lib/*/* || true - - libDir=$(cd $out/lib && ls -d firefox-[0-9]*) - test -n "$libDir" - - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner - - # Register extensions etc. !!! is this needed anymore? - echo "running firefox -register..." - $out/bin/firefox -register - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk; - isFirefox3Like = true; - }; -} - - diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix deleted file mode 100644 index 0fb5027e31e..00000000000 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.1.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, autoconf - -, # 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 -}: - -let - - version = "1.9.1b2"; # this attribute is used by other packages - -in - -stdenv.mkDerivation { - name = "xulrunner-${version}"; - - src = fetchurl { - url = ftp://ftp.mozilla.org/pub/firefox/releases/3.1b2/source/firefox-3.1b2-source.tar.bz2; - sha256 = "1mqy7q4bfw8iphlmzvymqfki8r4zzynyyy6z6gws4qqx9ry42jqs"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt - file alsaLib autoconf - ]; - - preConfigure = '' - export PREFIX=$out - export LIBXUL_DIST=$out - autoconf - cd js/src - autoconf - cd ../.. - ''; - - configureFlags = [ - "--enable-application=xulrunner" - "--disable-javaxpcom" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ]; - - installFlags = [ - "SKIP_GRE_REGISTRATION=1" - ]; - - postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # Fix some references to /bin paths in the Firefox shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm $out/bin/run-mozilla.sh || true - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk version; }; -} - - diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix deleted file mode 100644 index d21451a66ea..00000000000 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, autoconf - -, # 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 -}: - -let - - version = "1.9.1rc1"; - shownVersion = "1.9.1"; # this attribute is used by other packages - # _usually_ it is the same as version - ffversion = "3.5rc1"; - -in - -stdenv.mkDerivation rec { - name = "xulrunner-${version}"; - - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/firefox/releases/${ffversion}/source/firefox-${ffversion}-source.tar.bz2"; - sha256 = "14yrkvk0kibfpkcvbb44ww89plhm8iikbqmnc0jbkjr4k70a7gcl"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt - file alsaLib autoconf - ]; - - preConfigure = '' - export PREFIX=$out - export LIBXUL_DIST=$out - autoconf - cd js/src - autoconf - cd ../.. - ''; - - configureFlags = [ - "--enable-application=xulrunner" - "--disable-javaxpcom" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ]; - - installFlags = [ - "SKIP_GRE_REGISTRATION=1" - ]; - - postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # Fix some references to /bin paths in the Firefox shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm $out/bin/run-mozilla.sh || true - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk ffversion src; - version = shownVersion; - }; -} - - diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix deleted file mode 100644 index 3b345fe84df..00000000000 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file - -, # 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 -}: - -let - - version = "1.9.0.11"; # this attribute is used by other packages - -in - -stdenv.mkDerivation { - name = "xulrunner-${version}"; - - src = fetchurl { - url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/source/firefox-3.0.11-source.tar.bz2; - sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt - file - ]; - - configureFlags = [ - "--enable-application=xulrunner" - "--disable-javaxpcom" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ]; - - installFlags = [ - "SKIP_GRE_REGISTRATION=1" - ]; - - postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # Fix some references to /bin paths in the Firefox shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm $out/bin/run-mozilla.sh || true - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk version; }; -} - -