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

...into staging-next

pkgs/development/libraries/xxHash/default.nix

@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
-, fetchurl
+, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -16,13 +16,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-2WoYCO6QRHWrbGP2mK04/sLNTyQLOuL3urVktilAwMA=";
   };
 
+  # CMake build fixes
   patches = [
     # Merged in https://github.com/Cyan4973/xxHash/pull/649
     # Should be present in next release
-    (fetchurl {
-      name = "cmakeinstallfix.patch";
+    (fetchpatch {
+      name = "cmake-install-fix";
       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=";
     })
   ];