diff options
author | Kirill Boltaev <aske@fmap.me> | 2016-09-12 00:24:51 +0300 |
---|---|---|
committer | Kirill Boltaev <aske@fmap.me> | 2016-09-12 18:26:06 +0300 |
commit | bccd75094fd5108b3d834ad3a86e056eed3b0337 (patch) | |
tree | 8954184c0376ef2f8218b7df7049edde7ef6a49b /pkgs/applications/networking/browsers/firefox | |
parent | 30107249b1a5681771591cd65aa4f1c98f4cb023 (diff) | |
download | nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.gz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.bz2 nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.lz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.xz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.zst nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.zip |
treewide: explicitly specify gtk and related package versions
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3e93c560ebb4..cd6cbf667f13 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL +{ lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite @@ -30,7 +30,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa @@ -121,7 +121,8 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; passthru = { - inherit gtk nspr version; + inherit nspr version; + gtk = gtk2; isFirefox3Like = true; browserName = "firefox"; ffmpegSupport = lib.versionAtLeast version "46.0"; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c9adde4f15bb..4da733261774 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , gnash, flashplayer, hal-flash -, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra +, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ @@ -54,7 +54,7 @@ let ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; - gtk_modules = [ libcanberra ]; + gtk_modules = [ libcanberra_gtk2 ]; in stdenv.mkDerivation { |