Merge pull request #132797 from gardspirito/laboro
firefox: add smartcard support through opensc
This commit is contained in:
commit
44caf8f371
|
@ -2,7 +2,7 @@
|
||||||
, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText
|
, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText
|
||||||
|
|
||||||
## various stuff that can be plugged in
|
## various stuff that can be plugged in
|
||||||
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify
|
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
|
||||||
, gnome/*.gnome-shell*/
|
, gnome/*.gnome-shell*/
|
||||||
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
|
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
|
||||||
, tridactyl-native
|
, tridactyl-native
|
||||||
|
@ -49,6 +49,8 @@ let
|
||||||
gssSupport = browser.gssSupport or false;
|
gssSupport = browser.gssSupport or false;
|
||||||
alsaSupport = browser.alsaSupport or false;
|
alsaSupport = browser.alsaSupport or false;
|
||||||
pipewireSupport = browser.pipewireSupport or false;
|
pipewireSupport = browser.pipewireSupport or false;
|
||||||
|
# PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
|
||||||
|
smartcardSupport = cfg.smartcardSupport or false;
|
||||||
|
|
||||||
nativeMessagingHosts =
|
nativeMessagingHosts =
|
||||||
([ ]
|
([ ]
|
||||||
|
@ -70,6 +72,7 @@ let
|
||||||
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ])
|
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ])
|
||||||
++ lib.optional (config.pulseaudio or true) libpulseaudio
|
++ lib.optional (config.pulseaudio or true) libpulseaudio
|
||||||
++ lib.optional alsaSupport alsa-lib
|
++ lib.optional alsaSupport alsa-lib
|
||||||
|
++ lib.optional smartcardSupport opensc
|
||||||
++ pkcs11Modules;
|
++ pkcs11Modules;
|
||||||
gtk_modules = [ libcanberra-gtk3 ];
|
gtk_modules = [ libcanberra-gtk3 ];
|
||||||
|
|
||||||
|
@ -120,6 +123,10 @@ let
|
||||||
ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
|
ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
|
||||||
) [] extensions;
|
) [] extensions;
|
||||||
};
|
};
|
||||||
|
} // lib.optionalAttrs smartcardSupport {
|
||||||
|
SecurityDevices = {
|
||||||
|
"OpenSC PKCS#11 Module" = "onepin-opensc-pkcs11.so";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
// extraPolicies;
|
// extraPolicies;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue