firefox-bin: link native-messaging-hosts to correct location (#303562)
This commit is contained in:
@@ -53,6 +53,7 @@ let
|
||||
, extraPoliciesFiles ? []
|
||||
, libName ? browser.libName or applicationName # Important for tor package or the like
|
||||
, nixExtensions ? null
|
||||
, hasMozSystemDirPatch ? (lib.hasPrefix "firefox" pname && !lib.hasSuffix "-bin" pname)
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -321,12 +322,18 @@ let
|
||||
${lib.optionalString (!xdg-utils.meta.broken) "--suffix PATH ':' \"${xdg-utils}/bin\""} \
|
||||
--suffix PATH ':' "$out/bin" \
|
||||
--set MOZ_APP_LAUNCHER "${launcherName}" \
|
||||
'' + lib.optionalString hasMozSystemDirPatch ''
|
||||
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
|
||||
'' + ''
|
||||
--set MOZ_LEGACY_PROFILES 1 \
|
||||
--set MOZ_ALLOW_DOWNGRADE 1 \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \
|
||||
--set-default MOZ_ENABLE_WAYLAND 1 \
|
||||
'' + lib.optionalString (!hasMozSystemDirPatch) ''
|
||||
${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[@]}"
|
||||
#############################
|
||||
# #
|
||||
@@ -349,10 +356,12 @@ let
|
||||
|
||||
install -D -t $out/share/applications $desktopItem/share/applications/*
|
||||
|
||||
'' + lib.optionalString hasMozSystemDirPatch ''
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user