From 96c34702e90dd4957aced6013886aed7d0eed0a7 Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Wed, 9 Dec 2020 14:48:45 -0500 Subject: [PATCH] firefox: restrict system NSPR workaround It only affected FF80 so place an upper bound restriction. See bmo#1661096 for details. This fixes substituteStream() warnings about missing patterns which appeared in the logs. --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index d335313df7b..c0822e478f3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -197,7 +197,7 @@ buildStdenv.mkDerivation ({ substituteInPlace \ media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ --replace /usr/include ${pipewire.dev}/include - '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' + '' + lib.optionalString (lib.versionAtLeast ffversion "80" && lib.versionOlder ffversion "81") '' substituteInPlace dom/system/IOUtils.h \ --replace '#include "nspr/prio.h"' '#include "prio.h"'