b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #168586 from leungbk/update-spdlog-1.10.0

Browse source
This commit is contained in:
Sandro 2022-04-15 20:09:59 +02:00 committed by GitHub
parent 0074718c56 aaffbf925c
commit 82c5514d09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/libraries/spdlog/default.nix
View file

@ -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;
@ -38,7 +36,11 @@ let
'';
doCheck = true;
preCheck = "export LD_LIBRARY_PATH=$(pwd)\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH";
preCheck = if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
'' else ''
export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
'';
meta = with lib; {
description = "Very fast, header only, C++ logging library";
@ -51,15 +53,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 {