Skip to content

Commit 96afb4d

Browse files
firefox: Remove support for specific native host config options (deprecated since 23.11) (#374175)
2 parents f7bf632 + 4545eb3 commit 96afb4d

File tree

1 file changed

+3
-27
lines changed
  • pkgs/applications/networking/browsers/firefox

1 file changed

+3
-27
lines changed

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

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
{ stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config
1+
{ stdenv, lib, makeDesktopItem, makeWrapper, lndir, config
22
, buildPackages
33
, jq, xdg-utils, writeText
44

55
## various stuff that can be plugged in
66
, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
77
, adwaita-icon-theme
8-
, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire
9-
, tridactyl-native
10-
, fx-cast-bridge
11-
, keepassxc
8+
, pipewire
129
, udev
1310
, libkrb5
1411
, libva
@@ -36,7 +33,6 @@ let
3633
, icon ? applicationName
3734
, wmClass ? applicationName
3835
, nativeMessagingHosts ? []
39-
, extraNativeMessagingHosts ? []
4036
, pkcs11Modules ? []
4137
, useGlvnd ? true
4238
, cfg ? config.${applicationName} or {}
@@ -65,27 +61,7 @@ let
6561
# PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
6662
smartcardSupport = cfg.smartcardSupport or false;
6763

68-
deprecatedNativeMessagingHost = option: pkg:
69-
if (cfg.${option} or false)
70-
then
71-
lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead"
72-
[pkg]
73-
else [];
74-
75-
allNativeMessagingHosts = builtins.map lib.getBin (
76-
nativeMessagingHosts
77-
++ deprecatedNativeMessagingHost "enableBrowserpass" browserpass
78-
++ deprecatedNativeMessagingHost "enableBukubrow" bukubrow
79-
++ deprecatedNativeMessagingHost "enableTridactylNative" tridactyl-native
80-
++ deprecatedNativeMessagingHost "enableGnomeExtensions" gnome-browser-connector
81-
++ deprecatedNativeMessagingHost "enableUgetIntegrator" uget-integrator
82-
++ deprecatedNativeMessagingHost "enablePlasmaBrowserIntegration" plasma5Packages.plasma-browser-integration
83-
++ deprecatedNativeMessagingHost "enableFXCastBridge" fx-cast-bridge
84-
++ deprecatedNativeMessagingHost "enableKeePassXC" keepassxc
85-
++ (if extraNativeMessagingHosts != []
86-
then lib.warn "The extraNativeMessagingHosts argument for the Firefox wrapper is deprecated, please use `nativeMessagingHosts`" extraNativeMessagingHosts
87-
else [])
88-
);
64+
allNativeMessagingHosts = builtins.map lib.getBin nativeMessagingHosts;
8965

9066
libs = lib.optionals stdenv.hostPlatform.isLinux (
9167
[ udev libva libgbm libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ]

0 commit comments

Comments
 (0)