diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@nbp.name> | 2021-06-04 14:47:23 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-07 16:08:19 +0000 |
| commit | 440f0ac4666724ebd6ba53228639cbaf0f0594f5 (patch) | |
| tree | 73770846cb87af23dceac6d8db03c9a7cff7e016 | |
| parent | Merge pull request #126030 from NixOS/backport-125922-to-release-21.05 (diff) | |
| download | nixpkgs-440f0ac4666724ebd6ba53228639cbaf0f0594f5.tar.gz | |
firefox-bin: Avoid including both the wrapped and unwrapped version when using nix run command.origin/backport-125669-to-release-21.05
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 efef092ba59259fb2654038bbd952baca5c8bab7)
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 |
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 793e8688a5fa..13becfc4f629 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 - ######################### # # |