diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-12-02 11:22:44 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-12-02 14:41:38 +0100 |
| commit | 8580bda6863fa0cf2f926b650938fc422184efd6 (patch) | |
| tree | 36dec53ac46352b9c2a989b8f3823ae2f0b8a2a3 /pkgs/tools/misc/libcpuid | |
| parent | d4577bc68d87bb1a8703b87870065b73018837f5 (diff) | |
libcpuid: fix cross compilation to NetBSD
Applies an upstreamed patch which works around a double definition of popcount64. This change is all needed to cross compile nix to NetBSD, so we can extend the cross-trunk jobset as well.
Diffstat (limited to 'pkgs/tools/misc/libcpuid')
| -rw-r--r-- | pkgs/tools/misc/libcpuid/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 8c4cb5c1a7593..5abe5673bf298 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { patches = [ # Work around https://github.com/anrieff/libcpuid/pull/102. ./stdint.patch + # Fixes cross-compilation to NetBSD, remove me for libcpuid > 0.5.1 + (fetchpatch { + name = "use-popcount-from-libc.patch"; + url = "https://github.com/anrieff/libcpuid/commit/1acaf9980b55ae180cc08db218b9face28202519.patch"; + sha256 = "0lvsv9baq0sria1f1ncn1b2783js29lfs5fv8milp54pg1wd5b7q"; + }) ]; nativeBuildInputs = [ autoreconfHook ]; |