public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox: add option to build with GTK3 (close #7743)

Browse Source
This commit is contained in:
Kirill Elagin 2015-05-07 14:28:36 +03:00 committed by Vladimír Čunát
parent 3a90a80a9d
commit e5b56cdfff
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL { lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL
, libjpeg, 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
, cairo, gstreamer, gst_plugins_base, icu , cairo, gstreamer, gst_plugins_base, icu
, enableGTK3 ? false
, debugBuild ? false , debugBuild ? false
, # If you want the resulting program to call itself "Firefox" instead , # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those # of "Shiretoko" or whatever, enable this option. However, those
@ -34,7 +35,8 @@ stdenv.mkDerivation rec {
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx cairo hunspell libevent libstartup_notification libvpx cairo
gstreamer gst_plugins_base icu gstreamer gst_plugins_base icu
]; ]
++ lib.optional enableGTK3 gtk3;
configureFlags = configureFlags =
[ "--enable-application=browser" [ "--enable-application=browser"
@ -64,6 +66,7 @@ stdenv.mkDerivation rec {
"--disable-updater" "--disable-updater"
"--disable-pulseaudio" "--disable-pulseaudio"
] ]
++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
++ (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${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"

1
pkgs/top-level/all-packages.nix
View File

@ -11150,6 +11150,7 @@ let
firefox = callPackage ../applications/networking/browsers/firefox { firefox = callPackage ../applications/networking/browsers/firefox {
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite; inherit (pythonPackages) pysqlite;
enableGTK3 = false;
}; };
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };