Unverified Commit d6eb7caa authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #227354 from flokli/firefox-web-eid 

nixos/firefox: add config option for Web eID support
parents 5ead596a effa05c0

nixos/modules/programs/firefox.nix

+4 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ in 
    nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) {

      browserpass = "Browserpass support";

      bukubrow = "Bukubrow support";

      euwebid = "Web eID support";

      ff2mpv = "ff2mpv support";

      fxCast = "fx_cast support";

      gsconnect = "GSConnect support";
@@ -217,6 +218,8 @@ in 
        extraPrefs = cfg.autoConfig;

        extraNativeMessagingHosts = with pkgs; optionals nmh.ff2mpv [

          ff2mpv

        ] ++ optionals nmh.euwebid [

          web-eid-app

        ] ++ optionals nmh.gsconnect [

          gnomeExtensions.gsconnect

        ] ++ optionals nmh.jabref [
@@ -230,6 +233,7 @@ 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

+2 −1
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, pipewire

, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, web-eid-app, pipewire

, tridactyl-native

, fx_cast_bridge

, udev
@@ -65,6 +65,7 @@ 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