parent
21c7ed54e3
commit
5c5f115603
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
|
{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
|
||||||
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs
|
, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs
|
||||||
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||||
, hunspell, libevent, libstartup_notification, libvpx
|
, hunspell, libevent, libstartup_notification, libvpx
|
||||||
@ -15,27 +15,38 @@
|
|||||||
|
|
||||||
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
||||||
|
|
||||||
rec {
|
let version = "31.0"; in
|
||||||
|
|
||||||
firefoxVersion = "31.0";
|
|
||||||
|
|
||||||
xulVersion = "31.0"; # this attribute is used by other packages
|
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "firefox-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
|
||||||
sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb";
|
sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb";
|
||||||
};
|
};
|
||||||
|
|
||||||
commonConfigureFlags =
|
buildInputs =
|
||||||
[ "--with-system-jpeg"
|
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
|
||||||
|
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||||
|
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||||
|
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||||
|
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||||
|
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||||
|
hunspell libevent libstartup_notification libvpx cairo
|
||||||
|
gstreamer gst_plugins_base icu
|
||||||
|
];
|
||||||
|
|
||||||
|
configureFlags =
|
||||||
|
[ "--enable-application=browser"
|
||||||
|
"--disable-javaxpcom"
|
||||||
|
"--with-system-jpeg"
|
||||||
"--with-system-zlib"
|
"--with-system-zlib"
|
||||||
"--with-system-bz2"
|
"--with-system-bz2"
|
||||||
"--with-system-nspr"
|
"--with-system-nspr"
|
||||||
"--with-system-nss"
|
"--with-system-nss"
|
||||||
"--with-system-libevent"
|
"--with-system-libevent"
|
||||||
"--with-system-libvpx"
|
"--with-system-libvpx"
|
||||||
"--with-system-png"
|
# "--with-system-png" # needs APNG support
|
||||||
# "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
|
# "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
|
||||||
"--enable-system-ffi"
|
"--enable-system-ffi"
|
||||||
"--enable-system-hunspell"
|
"--enable-system-hunspell"
|
||||||
@ -52,160 +63,45 @@ rec {
|
|||||||
"--disable-installer"
|
"--disable-installer"
|
||||||
"--disable-updater"
|
"--disable-updater"
|
||||||
"--disable-pulseaudio"
|
"--disable-pulseaudio"
|
||||||
] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
|
]
|
||||||
|
++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
|
||||||
else [ "--disable-debug" "--enable-release"
|
else [ "--disable-debug" "--enable-release"
|
||||||
"--enable-optimize" "--enable-strip" ]);
|
"--enable-optimize" "--enable-strip" ])
|
||||||
|
++ lib.optional enableOfficialBranding "--enable-official-branding";
|
||||||
|
|
||||||
xulrunner = stdenv.mkDerivation rec {
|
|
||||||
name = "xulrunner-${xulVersion}";
|
|
||||||
|
|
||||||
inherit src;
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
|
|
||||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
|
||||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
|
||||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
|
||||||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
|
||||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
|
||||||
hunspell libevent libstartup_notification libvpx cairo
|
|
||||||
gstreamer gst_plugins_base icu
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags =
|
|
||||||
[ "--enable-application=xulrunner"
|
|
||||||
"--disable-javaxpcom"
|
|
||||||
] ++ commonConfigureFlags;
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
''
|
''
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
|
|
||||||
|
|
||||||
mkdir ../objdir
|
mkdir ../objdir
|
||||||
cd ../objdir
|
cd ../objdir
|
||||||
configureScript=../mozilla-release/configure
|
configureScript=../mozilla-release/configure
|
||||||
''; # */
|
|
||||||
|
|
||||||
#installFlags = "SKIP_GRE_REGISTRATION=1";
|
|
||||||
|
|
||||||
preInstall = ''
|
|
||||||
# The following is needed for startup cache creation on grsecurity kernels
|
|
||||||
paxmark m ../objdir/dist/bin/xpcshell
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
preInstall =
|
||||||
# Fix run-mozilla.sh search
|
|
||||||
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
|
|
||||||
echo libDir: $libDir
|
|
||||||
test -n "$libDir"
|
|
||||||
cd $out/bin
|
|
||||||
rm xulrunner
|
|
||||||
|
|
||||||
for i in $out/lib/$libDir/*; do
|
|
||||||
file $i;
|
|
||||||
if file $i | grep executable &>/dev/null; then
|
|
||||||
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
|
|
||||||
chmod a+x "$out/bin/$(basename "$i")";
|
|
||||||
fi;
|
|
||||||
done
|
|
||||||
for i in $out/lib/$libDir/*.so; do
|
|
||||||
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
|
|
||||||
done
|
|
||||||
|
|
||||||
# For grsecurity kernels
|
|
||||||
paxmark m $out/lib/$libDir/{plugin-container,xulrunner}
|
|
||||||
|
|
||||||
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
|
|
||||||
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
|
|
||||||
done
|
|
||||||
|
|
||||||
rm -f $out/bin/run-mozilla.sh
|
|
||||||
''; # */
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Mozilla Firefox XUL runner";
|
|
||||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
|
||||||
};
|
|
||||||
|
|
||||||
passthru = { inherit gtk; version = xulVersion; };
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
firefox = stdenv.mkDerivation rec {
|
|
||||||
name = "firefox-${firefoxVersion}";
|
|
||||||
|
|
||||||
inherit src;
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python
|
|
||||||
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
|
||||||
xlibs.pixman yasm mesa sqlite file unzip pysqlite
|
|
||||||
hunspell libevent libstartup_notification libvpx cairo
|
|
||||||
gstreamer gst_plugins_base icu
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./disable-reporter.patch # fixes "search box not working when built on xulrunner"
|
|
||||||
./xpidl.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [xulrunner];
|
|
||||||
|
|
||||||
configureFlags =
|
|
||||||
[ "--enable-application=browser"
|
|
||||||
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
|
|
||||||
"--enable-chrome-format=jar"
|
|
||||||
]
|
|
||||||
++ commonConfigureFlags
|
|
||||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
|
||||||
|
|
||||||
makeFlags = [
|
|
||||||
"SYSTEM_LIBXUL=1"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Because preConfigure runs configure from a subdirectory.
|
|
||||||
configureScript = "../configure";
|
|
||||||
|
|
||||||
preConfigure =
|
|
||||||
''
|
''
|
||||||
# Hack to work around make's idea of -lbz2 dependency
|
# The following is needed for startup cache creation on grsecurity kernels.
|
||||||
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
|
paxmark m ../objdir/dist/bin/xpcshell
|
||||||
stdenv.lib.concatStringsSep ":"
|
|
||||||
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
|
|
||||||
}' ';'
|
|
||||||
|
|
||||||
# Building directly in the main source directory is not allowed.
|
|
||||||
mkdir obj_dir
|
|
||||||
cd obj_dir
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
''
|
''
|
||||||
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
|
# For grsecurity kernels
|
||||||
cd "$out/lib/"firefox-*
|
paxmark m $out/lib/*/{plugin-container,xulrunner}
|
||||||
rm firefox
|
|
||||||
echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
|
|
||||||
chmod a+x firefox
|
|
||||||
|
|
||||||
# Put chrome.manifest etc. in the right place.
|
# Remove SDK cruft. FIXME: move to a separate output?
|
||||||
mv browser/* .
|
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
|
||||||
rmdir browser
|
'';
|
||||||
''; # */
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Mozilla Firefox - the browser, reloaded";
|
description = "Mozilla Firefox - the browser, reloaded";
|
||||||
homepage = http://www.mozilla.com/en-US/firefox/;
|
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||||
maintainers = with stdenv.lib.maintainers; [ eelco wizeman ];
|
maintainers = with lib.maintainers; [ eelco wizeman ];
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit gtk xulrunner nspr;
|
inherit gtk nspr version;
|
||||||
isFirefox3Like = true;
|
isFirefox3Like = true;
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
# from:
|
|
||||||
# - https://www.linuxquestions.org/questions/linux-from-scratch-13/blfs-xulrunner-firefox-21-0-and-search-4175462532/
|
|
||||||
# - http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg17359.html
|
|
||||||
|
|
||||||
--- mozilla-release/browser/base/content/browser.js.orig 2013-05-11 16:19:21.000000000 -0300
|
|
||||||
+++ mozilla-release/browser/base/content/browser.js 2013-06-07 00:39:16.114862388 -0300
|
|
||||||
@@ -3559,10 +3559,12 @@
|
|
||||||
*/
|
|
||||||
recordSearchInHealthReport: function (engine, source) {
|
|
||||||
#ifdef MOZ_SERVICES_HEALTHREPORT
|
|
||||||
- let reporter = Cc["@mozilla.org/datareporting/service;1"]
|
|
||||||
+ /*let reporter = Cc["@mozilla.org/datareporting/service;1"]
|
|
||||||
.getService()
|
|
||||||
.wrappedJSObject
|
|
||||||
.healthReporter;
|
|
||||||
+ */
|
|
||||||
+ return;
|
|
||||||
|
|
||||||
// This can happen if the FHR component of the data reporting service is
|
|
||||||
// disabled. This is controlled by a pref that most will never use.
|
|
@ -1,11 +0,0 @@
|
|||||||
--- mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-05 08:07:53.000000000 -0800
|
|
||||||
+++ mozilla-release_1/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-12 23:38:39.697318563 -0800
|
|
||||||
@@ -421,7 +421,7 @@
|
|
||||||
def _handle_idl_manager(self, manager):
|
|
||||||
build_files = self._purge_manifests['xpidl']
|
|
||||||
|
|
||||||
- for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
|
|
||||||
+ for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
|
|
||||||
'xpt/.mkdir.done'):
|
|
||||||
build_files.add(p)
|
|
||||||
|
|
@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";
|
sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner gmtk ];
|
buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ];
|
||||||
|
|
||||||
# !!! fix this
|
# !!! fix this
|
||||||
preBuild =
|
preBuild =
|
||||||
''
|
''
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*) -I${browser.nspr}/include/nspr"
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr}/include/nspr"
|
||||||
echo $NIX_CFLAGS_COMPILE
|
echo $NIX_CFLAGS_COMPILE
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "A browser plugin that uses GNOME MPlayer to play media in a browser";
|
description = "A browser plugin that uses GNOME MPlayer to play media in a browser";
|
||||||
homepage = http://kdekorte.googlepages.com/gecko-mediaplayer;
|
homepage = http://kdekorte.googlepages.com/gecko-mediaplayer;
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
82
pkgs/development/interpreters/xulrunner/default.nix
Normal file
82
pkgs/development/interpreters/xulrunner/default.nix
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
|
||||||
|
, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs
|
||||||
|
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||||
|
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||||
|
, hunspell, libevent, libstartup_notification, libvpx
|
||||||
|
, cairo, gstreamer, gst_plugins_base, icu
|
||||||
|
, debugBuild ? false
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
|
||||||
|
|
||||||
|
let version = "31.0"; in
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "xulrunner-${version}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
|
||||||
|
sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs =
|
||||||
|
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
|
||||||
|
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||||
|
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||||
|
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||||
|
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||||
|
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||||
|
hunspell libevent libstartup_notification libvpx cairo
|
||||||
|
gstreamer gst_plugins_base icu
|
||||||
|
];
|
||||||
|
|
||||||
|
configureFlags =
|
||||||
|
[ "--enable-application=xulrunner"
|
||||||
|
"--disable-javaxpcom"
|
||||||
|
"--with-system-jpeg"
|
||||||
|
"--with-system-zlib"
|
||||||
|
"--with-system-bz2"
|
||||||
|
"--with-system-nspr"
|
||||||
|
"--with-system-nss"
|
||||||
|
"--with-system-libevent"
|
||||||
|
"--with-system-libvpx"
|
||||||
|
# "--with-system-png" # needs APNG support
|
||||||
|
# "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
|
||||||
|
"--enable-system-ffi"
|
||||||
|
"--enable-system-hunspell"
|
||||||
|
"--enable-system-pixman"
|
||||||
|
"--enable-system-sqlite"
|
||||||
|
"--enable-system-cairo"
|
||||||
|
"--enable-gstreamer"
|
||||||
|
"--enable-startup-notification"
|
||||||
|
# "--enable-content-sandbox" # available since 26.0, but not much info available
|
||||||
|
# "--enable-content-sandbox-reporter" # keeping disabled for now
|
||||||
|
"--disable-crashreporter"
|
||||||
|
"--disable-tests"
|
||||||
|
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||||
|
"--disable-installer"
|
||||||
|
"--disable-updater"
|
||||||
|
"--disable-pulseaudio"
|
||||||
|
]
|
||||||
|
++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
|
||||||
|
else [ "--disable-debug" "--enable-release"
|
||||||
|
"--enable-optimize" "--enable-strip" ]);
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
preConfigure =
|
||||||
|
''
|
||||||
|
mkdir ../objdir
|
||||||
|
cd ../objdir
|
||||||
|
configureScript=../mozilla-release/configure
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Mozilla Firefox XUL runner";
|
||||||
|
homepage = http://www.mozilla.com/en-US/firefox/;
|
||||||
|
maintainers = [ lib.maintainers.eelco ];
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
passthru = { inherit gtk version; };
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, gobjectIntrospection
|
{ stdenv, fetchurl, gobjectIntrospection
|
||||||
, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
|
, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
|
||||||
, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio
|
, libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio
|
||||||
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
|
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
|
||||||
, pygobject3, libogg, enableGTK3 ? false }:
|
, pygobject3, libogg, enableGTK3 ? false }:
|
||||||
|
|
||||||
|
@ -3633,7 +3633,10 @@ let
|
|||||||
|
|
||||||
tcl = callPackage ../development/interpreters/tcl { };
|
tcl = callPackage ../development/interpreters/tcl { };
|
||||||
|
|
||||||
xulrunner = pkgs.firefoxPkgs.xulrunner;
|
xulrunner = callPackage ../development/interpreters/xulrunner {
|
||||||
|
inherit (gnome) libIDL;
|
||||||
|
inherit (pythonPackages) pysqlite;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
### DEVELOPMENT / MISC
|
### DEVELOPMENT / MISC
|
||||||
@ -8593,21 +8596,18 @@ let
|
|||||||
|
|
||||||
filezilla = callPackage ../applications/networking/ftp/filezilla { };
|
filezilla = callPackage ../applications/networking/ftp/filezilla { };
|
||||||
|
|
||||||
firefox = pkgs.firefoxPkgs.firefox;
|
|
||||||
|
|
||||||
firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix {
|
firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix {
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
};
|
};
|
||||||
|
|
||||||
firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
|
firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
|
||||||
|
|
||||||
firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
|
firefox = callPackage ../applications/networking/browsers/firefox {
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
inherit (pythonPackages) pysqlite;
|
inherit (pythonPackages) pysqlite;
|
||||||
libpng = libpng.override { apngSupport = true; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; };
|
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
|
||||||
|
|
||||||
firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
|
firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
|
||||||
gconf = pkgs.gnome.GConf;
|
gconf = pkgs.gnome.GConf;
|
||||||
@ -8620,7 +8620,6 @@ let
|
|||||||
|
|
||||||
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
|
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
|
||||||
debug = config.flashplayer.debug or false;
|
debug = config.flashplayer.debug or false;
|
||||||
# !!! Fix the dependency on two different builds of nss.
|
|
||||||
};
|
};
|
||||||
|
|
||||||
freecad = callPackage ../applications/graphics/freecad {
|
freecad = callPackage ../applications/graphics/freecad {
|
||||||
@ -8724,7 +8723,6 @@ let
|
|||||||
gmu = callPackage ../applications/audio/gmu { };
|
gmu = callPackage ../applications/audio/gmu { };
|
||||||
|
|
||||||
gnash = callPackage ../applications/video/gnash {
|
gnash = callPackage ../applications/video/gnash {
|
||||||
xulrunner = firefoxPkgs.xulrunner;
|
|
||||||
inherit (gnome) gtkglext;
|
inherit (gnome) gtkglext;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -341,9 +341,6 @@ let
|
|||||||
zsh = linux;
|
zsh = linux;
|
||||||
zsnes = ["i686-linux"];
|
zsnes = ["i686-linux"];
|
||||||
|
|
||||||
firefox36Pkgs.firefox = linux;
|
|
||||||
firefoxPkgs.firefox = linux;
|
|
||||||
|
|
||||||
gnome = {
|
gnome = {
|
||||||
gnome_panel = linux;
|
gnome_panel = linux;
|
||||||
metacity = linux;
|
metacity = linux;
|
||||||
|
Loading…
Reference in New Issue
Block a user