firefox-bin: link native-messaging-hosts to correct location (#303562)

authored by Sandro and committed by GitHub f6c38e53 97ae5134

+9
+9
pkgs/applications/networking/browsers/firefox/wrapper.nix
··· 53 53 , extraPoliciesFiles ? [] 54 54 , libName ? browser.libName or applicationName # Important for tor package or the like 55 55 , nixExtensions ? null 56 + , hasMozSystemDirPatch ? (lib.hasPrefix "firefox" pname && !lib.hasSuffix "-bin" pname) 56 57 }: 57 58 58 59 let ··· 321 322 ${lib.optionalString (!xdg-utils.meta.broken) "--suffix PATH ':' \"${xdg-utils}/bin\""} \ 322 323 --suffix PATH ':' "$out/bin" \ 323 324 --set MOZ_APP_LAUNCHER "${launcherName}" \ 325 + '' + lib.optionalString hasMozSystemDirPatch '' 324 326 --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ 327 + '' + '' 325 328 --set MOZ_LEGACY_PROFILES 1 \ 326 329 --set MOZ_ALLOW_DOWNGRADE 1 \ 327 330 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ 328 331 --suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \ 329 332 --set-default MOZ_ENABLE_WAYLAND 1 \ 333 + '' + lib.optionalString (!hasMozSystemDirPatch) '' 334 + ${lib.optionalString (allNativeMessagingHosts != []) "--run \"mkdir -p \\\${MOZ_HOME:-~/.mozilla}/native-messaging-hosts\""} \ 335 + ${lib.concatMapStringsSep " " (ext: "--run \"ln -sfLt \\\${MOZ_HOME:-~/.mozilla}/native-messaging-hosts ${ext}/lib/mozilla/native-messaging-hosts/*\"") allNativeMessagingHosts} \ 336 + '' + '' 330 337 "''${oldWrapperArgs[@]}" 331 338 ############################# 332 339 # # ··· 349 356 350 357 install -D -t $out/share/applications $desktopItem/share/applications/* 351 358 359 + '' + lib.optionalString hasMozSystemDirPatch '' 352 360 mkdir -p $out/lib/mozilla/native-messaging-hosts 353 361 for ext in ${toString allNativeMessagingHosts}; do 354 362 ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/* 355 363 done 364 + '' + '' 356 365 357 366 mkdir -p $out/lib/mozilla/pkcs11-modules 358 367 for ext in ${toString pkcs11Modules}; do