firefox-nin: link native-messaging-hosts to correct location when usi…

…ng firefox-bin
NixOS · May 19, 2024 · 4579971 · 4579971
1 parent f173d08
commit 4579971
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -324,6 +324,8 @@ let
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
             --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \
             --set-default MOZ_ENABLE_WAYLAND 1 \
+            ${lib.optionalString (allNativeMessagingHosts != []) "--run \"mkdir -p $''{MOZ_HOME-~/.mozilla}/native-messaging-hosts\""} \
+            ${lib.concatMapStringsSep " " (ext: "--run \"ln -sfLt $''{MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*\"") allNativeMessagingHosts} \
             "''${oldWrapperArgs[@]}"
         #############################
         #                           #
@@ -346,11 +348,6 @@ let
 
         install -D -t $out/share/applications $desktopItem/share/applications/*
 
-        mkdir -p $out/lib/mozilla/native-messaging-hosts
-        for ext in ${toString allNativeMessagingHosts}; do
-            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/*