JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #195312 from viraptor/libcpuid-0.6.0

Browse Source 
libcpuid: 0.5.1 -> 0.6.0
This commit is contained in:
ajs124 2022-10-16 23:54:58 +02:00 committed by GitHub
commit 5cce57b9e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/misc/libcpuid/default.nix
View File

@ -1,27 +1,16 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: { lib, stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcpuid"; pname = "libcpuid";
version = "0.5.1"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anrieff"; owner = "anrieff";
repo = "libcpuid"; repo = "libcpuid";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU="; sha256 = "sha256-XX+XFd1ehahIUGONAx2iOxetU0s6vONc7m91zEOWz5o=";
}; };
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 ]; nativeBuildInputs = [ autoreconfHook ];
meta = with lib; { meta = with lib; {

5
pkgs/tools/misc/libcpuid/stdint.patch
View File

@ -1,5 +0,0 @@
--- a/libcpuid/libcpuid.h
+++ b/libcpuid/libcpuid.h
@@ -88 +88 @@
-#include "libcpuid_types.h"
+#include <stdint.h>