mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-26 14:04:52 +00:00
spdlog: 1.9.2 -> 1.10.0
This commit is contained in:
parent
7c188d8bae
commit
a839c59d4e
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }:
|
||||
|
||||
let
|
||||
generic = { version, sha256, patches ? [] }:
|
||||
generic = { version, sha256 }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "spdlog";
|
||||
inherit version;
|
||||
@ -13,8 +13,6 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
# spdlog <1.3 uses a bundled version of fmt
|
||||
propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8;
|
||||
@ -51,15 +49,8 @@ let
|
||||
in
|
||||
{
|
||||
spdlog_1 = generic {
|
||||
version = "1.9.2";
|
||||
sha256 = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";
|
||||
patches = [
|
||||
# glibc 2.34 compat
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gabime/spdlog/commit/d54b8e89c058f3cab2b32b3e9a2b49fd171d5895.patch";
|
||||
sha256 = "sha256-pb7cREF90GXb5Mbs8xFLQ+eLo6Xum13/xYa8JUgJlbI=";
|
||||
})
|
||||
];
|
||||
version = "1.10.0";
|
||||
sha256 = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws=";
|
||||
};
|
||||
|
||||
spdlog_0 = generic {
|
||||
|
Loading…
Reference in New Issue
Block a user