ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge #197849: librewolf: fix build on aarch64-linux by upstream patch

Browse Source
This commit is contained in:
Vladimír Čunát 2022-10-27 08:17:06 +02:00
commit 2b248e9e5a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/librewolf/default.nix
View File

@ -9,7 +9,7 @@ in
binaryName = "librewolf"; binaryName = "librewolf";
version = librewolf-src.packageVersion; version = librewolf-src.packageVersion;
src = librewolf-src.firefox; src = librewolf-src.firefox;
inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru;
meta = { meta = {
description = "A fork of Firefox, focused on privacy, security and freedom"; description = "A fork of Firefox, focused on privacy, security and freedom";

10
pkgs/applications/networking/browsers/librewolf/librewolf.nix
View File

@ -1,4 +1,4 @@
{ callPackage }: { callPackage, lib, stdenv, fetchpatch }:
let let
src = callPackage ./src.nix { }; src = callPackage ./src.nix { };
in in
@ -6,7 +6,13 @@ rec {
inherit (src) packageVersion firefox source; 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 = [ extraConfigureFlags = [
"--with-app-name=librewolf" "--with-app-name=librewolf"