summary refs log tree commit diff
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2021-03-30 01:05:02 +0300
committerDoron Behar <doron.behar@gmail.com>2021-03-30 01:05:42 +0300
commitb2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd (patch)
tree78226e5b6c2b3d384f8b29975122582b7ff12333
parent1ca0f5bafef272b50b5b8764fa0aa77201e2dc11 (diff)
downloadnixpkgs-b2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd.tar
nixpkgs-b2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd.tar.gz
nixpkgs-b2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd.tar.bz2
nixpkgs-b2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd.tar.lz
nixpkgs-b2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd.tar.xz
nixpkgs-b2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd.tar.zst
nixpkgs-b2e4ab5d3089c8e507ed154bf0a7c2eb2fd317dd.zip
nlohmann_json: apply patch for pkg-config path
-rw-r--r--pkgs/development/libraries/nlohmann_json/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 74213534532..41a967a5b70 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
 }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs=";
   };
 
+  patches = [
+    # https://github.com/nlohmann/json/pull/2690
+    (fetchpatch {
+      url = "https://github.com/nlohmann/json/commit/53a9850eebb88c6ff95f6042d08d5c0cc9d18097.patch";
+      sha256 = "k+Og00nXNg5IsFQY5fWD3xVQQXUFFTie44UXole0S1M=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [