about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@nbp.name>2021-06-04 14:47:23 +0200
committerNicolas B. Pierron <nicolas.b.pierron@nbp.name>2021-06-07 11:42:18 +0200
commitefef092ba59259fb2654038bbd952baca5c8bab7 (patch)
tree8767e2e6a84cfef5123dd1c244c5acb7f8858a98 /pkgs
parent1c2986bbb806c57f9470bf3231d8da7250ab9091 (diff)
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 793e8688a5fa4..13becfc4f6297 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -303,10 +303,6 @@ let
             ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/*
         done
 
-        # For manpages, in case the program supplies them
-        mkdir -p $out/nix-support
-        echo ${browser} > $out/nix-support/propagated-user-env-packages
-
 
         #########################
         #                       #