diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-10-26 09:13:01 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-10-27 06:23:23 +0000 |
| commit | 3be030cee09a3afc52a8f1228992fcea3a321a12 (patch) | |
| tree | df17ce6b3e8105404e9b359d07d04d259d626382 | |
| parent | tor-browser-bundle-bin: 11.5.4 -> 11.5.5 (diff) | |
| download | nixpkgs-3be030cee09a3afc52a8f1228992fcea3a321a12.tar.gz | |
librewolf: fix build on aarch64-linux by upstream patch
https://hydra.nixos.org/build/196437728
Same as c08efaf08 for firefox.
Cleanup of the nix expression was needed; the previous patch file
didn't even exist (anymore?)
(cherry picked from commit 61598203a41345042d1ed0d68fbe3466be83c6be)
| -rw-r--r-- | pkgs/applications/networking/browsers/librewolf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/librewolf/librewolf.nix | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index bec0c3a9eda9..7fa6130628d6 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -9,7 +9,7 @@ in binaryName = "librewolf"; version = librewolf-src.packageVersion; src = librewolf-src.firefox; - inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; + inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru; meta = { description = "A fork of Firefox, focused on privacy, security and freedom"; diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index 68ed776e91c9..2d0d11a587af 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, lib, stdenv, fetchpatch }: let src = callPackage ./src.nix { }; in @@ -6,7 +6,13 @@ rec { inherit (src) packageVersion firefox source; - extraPatches = [ ./verify-telemetry-macros.patch ]; + extraPatches = lib.optionals stdenv.isAarch64 [ + (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1791275 + name = "no-sysctl-aarch64.patch"; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/0efaf5a00aaceeed679885e4cd393bd9a5fcd0ff"; + hash = "sha256-wS/KufeLFxCexQalGGNg8+vnQhzDiL79OLt8FtL/JJ8="; + }) + ]; extraConfigureFlags = [ "--with-app-name=librewolf" |