diff options
| author | Charlotte Van Petegem <charlotte@vanpetegem.me> | 2020-07-04 10:04:30 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:36 +0000 |
| commit | 73fb487dbdf032551e7ac79e067365a8aba60540 (patch) | |
| tree | 8a0e6c3692a2046ea2aba2fe5297ca69ded4ca18 /nixpkgs/pkgs | |
| parent | 4c47a52ebcf0cecfe3f90bfbd6fb20625bd567b7 (diff) | |
| download | nixlib-73fb487dbdf032551e7ac79e067365a8aba60540.tar nixlib-73fb487dbdf032551e7ac79e067365a8aba60540.tar.gz nixlib-73fb487dbdf032551e7ac79e067365a8aba60540.tar.bz2 nixlib-73fb487dbdf032551e7ac79e067365a8aba60540.tar.lz nixlib-73fb487dbdf032551e7ac79e067365a8aba60540.tar.xz nixlib-73fb487dbdf032551e7ac79e067365a8aba60540.tar.zst nixlib-73fb487dbdf032551e7ac79e067365a8aba60540.zip | |
firefox: support for PKCS#11 modules in wrapper
(cherry picked from commit 49dba9c90b2b5337cacf33615b6440fd7a56102d)
Diffstat (limited to 'nixpkgs/pkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9a8308fa9a94..27251ae661ba 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -27,6 +27,7 @@ let , nameSuffix ? "" , icon ? browserName , extraNativeMessagingHosts ? [] + , pkcs11Modules ? [] , forceWayland ? false , useGlvnd ? true , cfg ? config.${browserName} or {} @@ -74,7 +75,8 @@ let ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash - ++ lib.optional (config.pulseaudio or true) libpulseaudio; + ++ lib.optional (config.pulseaudio or true) libpulseaudio + ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { @@ -154,6 +156,11 @@ let ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/* done + mkdir -p $out/lib/mozilla/pkcs11-modules + for ext in ${toString pkcs11Modules}; do + ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/* + done + # For manpages, in case the program supplies them mkdir -p $out/nix-support echo ${browser} > $out/nix-support/propagated-user-env-packages |