Merge pull request #7139 from spwhitt/remove_mozilla
Remove mozilla browser
This commit is contained in:
commit
a3ebed042c
@ -1,51 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
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() {
|
||||
|
||||
# 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
|
||||
|
||||
}
|
||||
|
||||
buildFlags="-f client.mk build"
|
||||
|
||||
genericBuild
|
@ -1,21 +0,0 @@
|
||||
{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
|
||||
|
||||
# !!! assert libIDL.glib == gtk.glib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mozilla-1.7.12";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.12/source/mozilla-1.7.12-source.tar.bz2;
|
||||
md5 = "f1ad6adbbc0510eb76d352c94c801fac";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig gtk perl zip libIDL libXi];
|
||||
inherit gtk;
|
||||
|
||||
#patches = [./writable-copies.patch];
|
||||
meta = {
|
||||
homepage = http://www.mozilla.org;
|
||||
};
|
||||
}
|
@ -11211,10 +11211,6 @@ let
|
||||
|
||||
mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { };
|
||||
|
||||
mozilla = callPackage ../applications/networking/browsers/mozilla {
|
||||
inherit (gnome) libIDL;
|
||||
};
|
||||
|
||||
mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) {
|
||||
inherit firefox;
|
||||
inherit (xlibs) libX11 xproto;
|
||||
|
Loading…
Reference in New Issue
Block a user