diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-10-27 12:51:15 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-10-27 12:51:15 +0200 |
| commit | c132d0837dfb9035701dcd8fc91786c605c855c3 (patch) | |
| tree | 59b3ce66b270ceb5244a483871ca226018b9f849 | |
| parent | Merge #197034: thunderbird*: 102.3.3 -> 102.4.0 (diff) | |
| parent | librewolf: fix build on aarch64-linux by upstream patch (diff) | |
| download | nixpkgs-c132d0837dfb9035701dcd8fc91786c605c855c3.tar.gz | |
Merge #198013: librewolf: fix build on aarch64-linux by upstream patch
...into release-22.05
| -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" |