summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2020-12-11 22:17:39 +0100
committerGitHub <noreply@github.com>2020-12-11 22:17:39 +0100
commit6a163d2dead80b657f19269e1efbf4a6d4d6d555 (patch)
tree28acfe5658f672da5adc0d3c642aa13573f1e0b9 /pkgs
parenta7b60e6bdfb578404be012b0f2296fb49c3b93a6 (diff)
parent36436ee8ac23d2ecff5faa55f5dedf3499c7664a (diff)
Merge pull request #105894 from ryneeverett/firefox-xdg
firefox: Prefix $PATH with xdg_utils
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 7f0b826f905e..a9888c3c47be 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -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}" \