diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-10-09 22:55:55 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2022-02-27 10:25:40 +0100 |
| commit | f8a7d99e54e0a7cc0a41e89c74e04015aafdc369 (patch) | |
| tree | 812826ae70bb361bf8f92d4f6b086b5e686f66b0 /pkgs/development | |
| parent | bcf8aeff3c7fbf92d576f89dad6a21913f7eb37a (diff) | |
| download | nixpkgs-f8a7d99e54e0a7cc0a41e89c74e04015aafdc369.tar nixpkgs-f8a7d99e54e0a7cc0a41e89c74e04015aafdc369.tar.gz nixpkgs-f8a7d99e54e0a7cc0a41e89c74e04015aafdc369.tar.bz2 nixpkgs-f8a7d99e54e0a7cc0a41e89c74e04015aafdc369.tar.lz nixpkgs-f8a7d99e54e0a7cc0a41e89c74e04015aafdc369.tar.xz nixpkgs-f8a7d99e54e0a7cc0a41e89c74e04015aafdc369.tar.zst nixpkgs-f8a7d99e54e0a7cc0a41e89c74e04015aafdc369.zip | |
spdlog: 1.8.5 -> 1.9.2, fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/155163350
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/spdlog/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index d4e0888ffd2..2857b8776f6 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 }: let generic = { version, sha256 }: @@ -13,6 +13,14 @@ let inherit sha256; }; + patches = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://github.com/gabime/spdlog/commit/d54b8e89c058f3cab2b32b3e9a2b49fd171d5895.patch"; + sha256 = "sha256-pb7cREF90GXb5Mbs8xFLQ+eLo6Xum13/xYa8JUgJlbI="; + }) + ]; + nativeBuildInputs = [ cmake ]; # spdlog <1.3 uses a bundled version of fmt propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; |