From 29e93555ec43618c8fee71a301a5485e1189ab9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Jan 2017 11:21:40 +0100 Subject: [PATCH] firefox*: fixup build after updating sed I failed to simply patch the bad [:space:] usage; I don't know why. --- pkgs/applications/networking/browsers/firefox/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3b0eb140516..6a688de02d0 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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6827e1c164a..c2182870df9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13216,6 +13216,7 @@ in libpng = libpng_apng; enableGTK3 = false; python = python2; + gnused = gnused_422; }) firefox-unwrapped firefox-esr-unwrapped; firefox = wrapFirefox firefox-unwrapped { };