diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
commit | 07bf828bd96591b302bd0a05edee48d2f4834efb (patch) | |
tree | 22f053f5aaa4243c47d887237fa1f1d59b10d6f5 /pkgs/applications/networking/browsers | |
parent | 99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529 (diff) | |
parent | d442a0ffc0ad7e33fa0fddaf0365caf80193a224 (diff) | |
download | nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.gz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.bz2 nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.lz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.xz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.zst nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.zip |
Merge branch 'staging'; security /cc #21642
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3b0eb1405169..6a688de02d08 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -44,7 +44,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { ++ lib.optional enableGTK3 gtk3 ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst_plugins_base ]; - nativeBuildInputs = [autoconf213 which]; + nativeBuildInputs = [ autoconf213 which gnused ]; configureFlags = [ "--enable-application=browser" |