diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-05-21 17:52:39 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-05-21 17:52:39 +0200 |
| commit | b8b9f52393a29cba011a79d20e3cc3dcac29192b (patch) | |
| tree | 609c716c876648a401cb57248d72635b1d8c8b84 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 77bded3c433fbd36e2d834c6416150f20de2ae2e (diff) | |
| parent | 3925da79a55c954b9bdf5ca92799210484f36832 (diff) | |
| download | nixpkgs-b8b9f52393a29cba011a79d20e3cc3dcac29192b.tar nixpkgs-b8b9f52393a29cba011a79d20e3cc3dcac29192b.tar.gz nixpkgs-b8b9f52393a29cba011a79d20e3cc3dcac29192b.tar.bz2 nixpkgs-b8b9f52393a29cba011a79d20e3cc3dcac29192b.tar.lz nixpkgs-b8b9f52393a29cba011a79d20e3cc3dcac29192b.tar.xz nixpkgs-b8b9f52393a29cba011a79d20e3cc3dcac29192b.tar.zst nixpkgs-b8b9f52393a29cba011a79d20e3cc3dcac29192b.zip | |
Merge branch 'master' into staging-next
Conflicts: - pkgs/applications/networking/browsers/firefox/common.nix between 318fae87c0b61eb2eabe6d96b5824cc6e282c513 and f6c57619358d51e71a5298503c84e1c1ce4f9f12.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5700f6cd93d..217b4e32388 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -4,6 +4,7 @@ , updateScript ? null , binaryName ? "firefox" , application ? "browser" +, applicationName ? "Mozilla Firefox" , src , unpackPhase ? null , extraPatches ? [] @@ -18,6 +19,7 @@ { lib +, pkgs , stdenv # build time @@ -167,6 +169,22 @@ let ln -s $lib $out/lib/wasm32-wasi done ''; + + distributionIni = pkgs.writeText "distribution.ini" (lib.generators.toINI {} { + # Some light branding indicating this build uses our distro preferences + Global = { + id = "nixos"; + version = "1.0"; + about = "${applicationName} for NixOS"; + }; + Preferences = { + # These values are exposed through telemetry + "app.distributor" = "nixos"; + "app.distributor.channel" = "nixpkgs"; + "app.partner.nixos" = "nixos"; + }; + }); + in buildStdenv.mkDerivation ({ @@ -304,6 +322,7 @@ buildStdenv.mkDerivation ({ "--enable-application=${application}" "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}" "--enable-system-pixman" + "--with-distribution-id=org.nixos" "--with-libclang-path=${llvmPackagesBuildBuild.libclang.lib}/lib" "--with-system-ffi" "--with-system-icu" @@ -445,7 +464,11 @@ buildStdenv.mkDerivation ({ cd mozobj ''; - postInstall = lib.optionalString buildStdenv.isLinux '' + postInstall = '' + # Install distribution customizations + install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini + + '' + lib.optionalString buildStdenv.isLinux '' # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-* |