diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-02-16 20:26:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 20:26:15 -0800 |
| commit | 0d1dde0e78c4f8cadeeae00339e59325d313577f (patch) | |
| tree | 334f2b32d7d55bf814c3a5b17b16a1c85c3382be /pkgs/applications/networking | |
| parent | 3d0f97420ebace5d0ef4553c3c37149dae677fd3 (diff) | |
| parent | 9ead68aa4b70f9cc934d15937e34cfb47ffb1b61 (diff) | |
| download | nixpkgs-0d1dde0e78c4f8cadeeae00339e59325d313577f.tar nixpkgs-0d1dde0e78c4f8cadeeae00339e59325d313577f.tar.gz nixpkgs-0d1dde0e78c4f8cadeeae00339e59325d313577f.tar.bz2 nixpkgs-0d1dde0e78c4f8cadeeae00339e59325d313577f.tar.lz nixpkgs-0d1dde0e78c4f8cadeeae00339e59325d313577f.tar.xz nixpkgs-0d1dde0e78c4f8cadeeae00339e59325d313577f.tar.zst nixpkgs-0d1dde0e78c4f8cadeeae00339e59325d313577f.zip | |
Merge pull request #121596 from arcnmx/firefox-wrapper
firefox-bin: provide wrapper with firefoxLibName
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 29a506dd1b0..8df80ab526a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -190,6 +190,8 @@ stdenv.mkDerivation { ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; + passthru.applicationName = "firefox"; + passthru.libName = "firefox-bin-${version}"; passthru.execdir = "/bin"; passthru.ffmpegSupport = true; passthru.gssSupport = true; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9a4c3edfef3..b428687025d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -42,7 +42,7 @@ let # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} , extraPoliciesFiles ? [] - , libName ? "firefox" # Important for tor package or the like + , libName ? browser.libName or "firefox" # Important for tor package or the like , nixExtensions ? null }: @@ -202,8 +202,8 @@ let find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; - find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do - cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" + find . -type f \( -name "${applicationName}" -o -name "${applicationName}-bin" \) -print0 | while read -d $'\0' f; do + cp -P --no-preserve=mode,ownership --remove-destination "${browser}/$f" "$out/$f" chmod a+rwx "$out/$f" done |