cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #177851: xxHash: add pkg-config file fix, clean up a bit

Browse source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2022-06-16 11:26:38 +02:00
commit ca9adc47f9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/xxHash/default.nix
View file

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, fetchurl , fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,13 +16,21 @@ stdenv.mkDerivation rec {
sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA="; sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA=";
}; };
# CMake build fixes
patches = [ patches = [
# Merged in https://github.com/Cyan4973/xxHash/pull/649 # Merged in https://github.com/Cyan4973/xxHash/pull/649
# Should be present in next release # Should be present in next release
(fetchurl { (fetchpatch {
name = "cmakeinstallfix.patch"; name = "cmake-install-fix";
url = "https://github.com/Cyan4973/xxHash/commit/636f966ecc713c84ddd3b7ccfde2bfb2cc7492a0.patch"; url = "https://github.com/Cyan4973/xxHash/commit/636f966ecc713c84ddd3b7ccfde2bfb2cc7492a0.patch";
hash = "sha256-fj+5V5mDhFgWGvrG1E4fEekL4eh7as0ouVvY4wnIHjs="; sha256 = "sha256-B1PZ/0BXlOrSiPvgCPLvI/sjQvnR0n5PQHOO38LOij0=";
})
# Submitted at https://github.com/Cyan4973/xxHash/pull/723
(fetchpatch {
name = "cmake-pkgconfig-fix";
url = "https://github.com/Cyan4973/xxHash/commit/5db353bbd05ee5eb1f90afc08d10da9416154e55.patch";
sha256 = "sha256-dElgSu9DVo2hY6TTVHLTtt0zkXmQV3nc9i/KbrDkK8s=";
}) })
]; ];