Unverified Commit d4f5099e authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #240730 from doronbehar/pkg/spdlog-fmt

spdlog: reformat expression arguments, and comment about fmt_9
parents 9699a81f 48c25dca
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ let
  # 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
  spdlog' = spdlog.override {
    fmt = fmt_8.overrideAttrs (_: rec {
    fmt_9 = fmt_8.overrideAttrs (_: rec {
      version = "8.0.1";
      src = fetchFromGitHub {
        owner = "fmtlib";
+10 −2
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fmt
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
# Although we include upstream patches that fix compilation with fmt_10, we
# still use fmt_9 because this dependency is propagated, and many of spdlog's
# reverse dependencies don't support fmt_10 yet.
, fmt_9
, staticBuild ? stdenv.hostPlatform.isStatic

# tests
@@ -29,7 +37,7 @@ stdenv.mkDerivation rec {
  ];

  nativeBuildInputs = [ cmake ];
  propagatedBuildInputs = [ fmt ];
  propagatedBuildInputs = [ fmt_9 ];

  cmakeFlags = [
    "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"
+1 −3
Original line number Diff line number Diff line
@@ -40969,9 +40969,7 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
  };
  spdlog = callPackage ../development/libraries/spdlog {
    fmt = fmt_9;
  };
  spdlog = callPackage ../development/libraries/spdlog { };
  dart = callPackage ../development/compilers/dart { };