From a4e8158923758b5a0670507ef264717bbdccf520 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 15 May 2023 00:48:01 -0400 Subject: [PATCH] libcpuid: Fix NetBSD cross build Underlying PR is https://github.com/anrieff/libcpuid/pull/190 --- pkgs/tools/misc/libcpuid/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 9773697f893..cb3de447572 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"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-lhoHqdS5tke462guORg+PURjVmjAgviT5KJHp6PyvUA="; }; + patches = [ + # Fixes cross-compilation to NetBSD + # https://github.com/anrieff/libcpuid/pull/190 + (fetchpatch { + name = "pass-pthread-to-linker.patch"; + url = "https://github.com/anrieff/libcpuid/commit/c28436e7239f28dab0e2a3bcdbce95f41e1363b1.patch"; + sha256 = "sha256-J2mB010JcE4si0rERjcrL9kJgbWHKaQCIZPDkmRvcq4="; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; {