about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Benes <nbenes.gh@xandea.de>2023-03-22 19:42:16 +0100
committerNicolas Benes <nbenes.gh@xandea.de>2023-04-06 07:25:19 +0200
commitcbf0264cd8248c28b6ddeb7a31b4a8234234b974 (patch)
tree2cb18146bec2ab890277c171d308562f09368cbb
parent3e886954eeca107e47b886ef260dcd35622ca074 (diff)
micromamba: remove spdlog workaround
spdlog uses fmt_9 and is compatible with micromamba. The workaround is
not needed any more.
-rw-r--r--pkgs/tools/package-management/micromamba/default.nix18
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix
index e79bfc889dcfa..5844044dc337e 100644
--- a/pkgs/tools/package-management/micromamba/default.nix
+++ b/pkgs/tools/package-management/micromamba/default.nix
@@ -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 = [