diff options
| author | Artturin <Artturin@artturin.com> | 2022-08-11 00:02:54 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-09-07 21:49:33 +0300 |
| commit | 2d03092f09013563e0076a6b813456117e41d23e (patch) | |
| tree | 0332bcdeb34febb8b87b9761b8422da91cf942d9 | |
| parent | 9d05c944628c016a9f0accb74aa35b22f46b5683 (diff) | |
| download | nixpkgs-2d03092f09013563e0076a6b813456117e41d23e.tar nixpkgs-2d03092f09013563e0076a6b813456117e41d23e.tar.gz nixpkgs-2d03092f09013563e0076a6b813456117e41d23e.tar.bz2 nixpkgs-2d03092f09013563e0076a6b813456117e41d23e.tar.lz nixpkgs-2d03092f09013563e0076a6b813456117e41d23e.tar.xz nixpkgs-2d03092f09013563e0076a6b813456117e41d23e.tar.zst nixpkgs-2d03092f09013563e0076a6b813456117e41d23e.zip | |
spdlog: fix path in pkg-config file
| -rw-r--r-- | pkgs/development/libraries/spdlog/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 9c61ef70624..b77eb935d4e 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; |