From 1d0225adc0e17baec4292855c6c34b769d3e3d3c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 30 Nov 2020 10:09:05 +0100 Subject: [PATCH] firefox: move the no-buildconfig-ffx76 patch into common This patch has been used on all our flavors for some time now. We can just move it to the common expression. --- pkgs/applications/networking/browsers/firefox/common.nix | 1 + .../applications/networking/browsers/firefox/packages.nix | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 988f47f3bfbb..1fbfdc2a7da6 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -118,6 +118,7 @@ buildStdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch + ./no-buildconfig-ffx76.patch ] ++ # there are two flavors of pipewire support diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 352e7bac5e9c..ef6398ea9559 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -13,10 +13,6 @@ rec { sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a"; }; - patches = [ - ./no-buildconfig-ffx76.patch - ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; @@ -41,10 +37,6 @@ rec { sha512 = "20h53cn7p4dds1yfm166iwbjdmw4fkv5pfk4z0pni6x8ddjvg19imzs6ggmpnfhaji8mnlknm7xp5j7x9vi24awvdxdds5n88rh25hd"; }; - patches = [ - ./no-buildconfig-ffx76.patch - ]; - meta = { description = "A web browser built from Firefox Extended Support Release source tree"; homepage = "http://www.mozilla.com/en-US/firefox/";