Skip to content

Commit 440f0ac

Browse files
nbpgithub-actions[bot]
authored andcommitted
firefox-bin: Avoid including both the wrapped and unwrapped version when using nix run command.
In order to make the man pages accessible, the previous code used nix-support/propagated-user-env-packages. However this file is also used to set the PATH when the application is executed with `nix run`, thus including the wrapped and the wrappee in the environment. Having the wrappee enumerated first in the environment caused `firefox` to default to the wrappee, and as such not being able to find a proper GTK. This was a source of failures while opening a file-picker. This change removes the code to propagate the wrappe in the environment, as the man pages are already linked in the wrapper output. (cherry picked from commit efef092)
1 parent 60f3e36 commit 440f0ac

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

  • pkgs/applications/networking/browsers/firefox

pkgs/applications/networking/browsers/firefox/wrapper.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,6 @@ let
303303
ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/*
304304
done
305305
306-
# For manpages, in case the program supplies them
307-
mkdir -p $out/nix-support
308-
echo ${browser} > $out/nix-support/propagated-user-env-packages
309-
310306
311307
#########################
312308
# #

0 commit comments

Comments
 (0)