Commit cbf0264c authored by Nicolas Benes's avatar Nicolas Benes
Browse files

micromamba: remove spdlog workaround

spdlog uses fmt_9 and is compatible with micromamba. The workaround is
not needed any more.
parent 3e886954
Loading
Loading
Loading
Loading
+1 −17
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@
, spdlog
, termcolor
, tl-expected
, fmt_9
}:

let
@@ -34,20 +33,6 @@ let
      })
    ];
  });

  spdlog' = spdlog.overrideAttrs (oldAttrs: {
    # Use as header-only library.
    #
    # Spdlog 1.11 requires fmt version 8 while micromamba requires
    # version 9. spdlog may use its bundled version of fmt,
    # though. Micromamba is not calling spdlog functions with
    # fmt-types in their signature. I.e. we get away with removing
    # fmt_8 from spdlog's propagated dependencies and using fmt_9 for
    # micromamba itself.
    dontBuild = true;
    cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DSPDLOG_FMT_EXTERNAL=OFF" ];
    propagatedBuildInputs = [];
  });
in
stdenv.mkDerivation rec {
  pname = "micromamba";
@@ -71,12 +56,11 @@ stdenv.mkDerivation rec {
    yaml-cpp
    libsolv'
    reproc
    spdlog'
    spdlog
    termcolor
    ghc_filesystem
    python3
    tl-expected
    fmt_9
  ];

  cmakeFlags = [