From ca1dd491c6e2d4831e94a0908c7ddf8b9e22d5ee Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 18 Jul 2023 11:46:15 +0300 Subject: [PATCH] nixos/firefox: stop reading nixpkgs.config.firefox.enableEUWebID This can cause firefox to be overridden with nativeMessagingHosts pointing to web-eid-app twice, causing a conflict during build. --- nixos/modules/programs/firefox.nix | 1 - pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index ead048134d8d..d67bbee9a761 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -233,7 +233,6 @@ in nixpkgs.config.firefox = { enableBrowserpass = nmh.browserpass; enableBukubrow = nmh.bukubrow; - enableEUWebID = nmh.euwebid; enableTridactylNative = nmh.tridactyl; enableUgetIntegrator = nmh.ugetIntegrator; enableFXCastBridge = nmh.fxCast; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6b08a891ec69..1e8240d6800e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -5,7 +5,7 @@ ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ -, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, web-eid-app, pipewire +, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge , udev @@ -65,7 +65,6 @@ let [ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow - ++ lib.optional (cfg.enableEUWebID or false) web-eid-app ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator