spdlog: 1.10.0 -> 1.11.0
Unpin from fmt_8.
This commit is contained in:
parent
579296ff47
commit
3e886954ee
|
@ -41,7 +41,7 @@ let
|
||||||
# no stable hal release yet with recent spdlog/fmt support, remove
|
# no stable hal release yet with recent spdlog/fmt support, remove
|
||||||
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
|
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
|
||||||
spdlog' = spdlog.override {
|
spdlog' = spdlog.override {
|
||||||
fmt_8 = fmt_8.overrideAttrs (_: rec {
|
fmt = fmt_8.overrideAttrs (_: rec {
|
||||||
version = "8.0.1";
|
version = "8.0.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "fmtlib";
|
owner = "fmtlib";
|
||||||
|
|
|
@ -1,27 +1,20 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch
|
{ lib, stdenv, fetchFromGitHub, cmake, fmt
|
||||||
, staticBuild ? stdenv.hostPlatform.isStatic
|
, staticBuild ? stdenv.hostPlatform.isStatic
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "spdlog";
|
pname = "spdlog";
|
||||||
version = "1.10.0";
|
version = "1.11.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gabime";
|
owner = "gabime";
|
||||||
repo = "spdlog";
|
repo = "spdlog";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws=";
|
hash = "sha256-kA2MAb4/EygjwiLEjF9EA7k8Tk//nwcKB1+HlzELakQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# 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 ];
|
nativeBuildInputs = [ cmake ];
|
||||||
propagatedBuildInputs = [ fmt_8 ];
|
propagatedBuildInputs = [ fmt ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"
|
"-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"
|
||||||
|
|
Loading…
Reference in a new issue