From 2d03092f09013563e0076a6b813456117e41d23e Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 11 Aug 2022 00:02:54 +0300 Subject: spdlog: fix path in pkg-config file --- pkgs/development/libraries/spdlog/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/spdlog') diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 9c61ef70624db..b77eb935d4e6b 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch , staticBuild ? stdenv.hostPlatform.isStatic }: @@ -15,6 +15,13 @@ let inherit sha256; }; + # in master post 1.10.0, see https://github.com/gabime/spdlog/issues/2380 + patches = lib.optional (lib.versionAtLeast version "1.4.1") (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/gabime/spdlog/commit/afb69071d5346b84e38fbcb0c8c32eddfef02a55.patch"; + sha256 = "0cab2bbv8zyfhrhfvcyfwf5p2fddlq5hs2maampn5w18f6jhvk6q"; + }); + nativeBuildInputs = [ cmake ]; # spdlog <1.3 uses a bundled version of fmt propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; -- cgit 1.4.1