Commit ca1dd491 authored by Florian Klink's avatar Florian Klink
Browse files

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.
parent 5cf8ccd4

nixos/modules/programs/firefox.nix

+0 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/applications/networking/browsers/firefox/wrapper.nix

+1 −2
Original line number Diff line number Diff line
@@ -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