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 61598203a4)
This commit is contained in:
Vladimír Čunát
2022-10-26 09:13:01 +02:00
committed by github-actions[bot]
parent 2f5687d697
commit 3be030cee0
2 changed files with 9 additions and 3 deletions

View File

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

View File

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