Merge pull request #105894 from ryneeverett/firefox-xdg

firefox: Prefix $PATH with xdg_utils
This commit is contained in:
Martin Weinelt 2020-12-11 22:17:39 +01:00 committed by GitHub
commit 6a163d2dea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, lndir, config
, replace, fetchurl, zip, unzip, jq
, replace, fetchurl, zip, unzip, jq, xdg_utils
## various stuff that can be plugged in
, flashplayer, hal-flash
@ -251,6 +251,7 @@ let
--suffix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix PATH ':' "${xdg_utils}/bin" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \