JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #121596 from arcnmx/firefox-wrapper

Browse Source 
firefox-bin: provide wrapper with firefoxLibName
This commit is contained in:
Bernardo Meurer 2022-02-16 20:26:15 -08:00 committed by GitHub
commit 0d1dde0e78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -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;

6
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -25709,9 +25709,7 @@ with pkgs;
};
firefox-bin = wrapFirefox firefox-bin-unwrapped {
applicationName = "firefox";
pname = "firefox-bin";
desktopName = "Firefox";
};
firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override {
@ -25721,7 +25719,6 @@ with pkgs;
};
firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
applicationName = "firefox";
pname = "firefox-beta-bin";
desktopName = "Firefox Beta";
};
@ -25733,7 +25730,6 @@ with pkgs;
};
firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
applicationName = "firefox";
nameSuffix = "-devedition";
pname = "firefox-devedition-bin";
desktopName = "Firefox DevEdition";