diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-03-06 18:41:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-03-06 19:38:05 +0100 |
| commit | 7dbe204ce744ab872aa8894c2f4d930b94718b21 (patch) | |
| tree | 35f65235e6d47e6322e92f4f413cb95e1bd25f9e /pkgs/tools/package-management | |
| parent | 485c8dd8769bbbc84b783cf04fca623e47a16b7d (diff) | |
| parent | 59aa4beeb8339db0ed1373055c1c0f140355a626 (diff) | |
| download | nixpkgs-7dbe204ce744ab872aa8894c2f4d930b94718b21.tar nixpkgs-7dbe204ce744ab872aa8894c2f4d930b94718b21.tar.gz nixpkgs-7dbe204ce744ab872aa8894c2f4d930b94718b21.tar.bz2 nixpkgs-7dbe204ce744ab872aa8894c2f4d930b94718b21.tar.lz nixpkgs-7dbe204ce744ab872aa8894c2f4d930b94718b21.tar.xz nixpkgs-7dbe204ce744ab872aa8894c2f4d930b94718b21.tar.zst nixpkgs-7dbe204ce744ab872aa8894c2f4d930b94718b21.zip | |
Merge #161666: micromamba: 0.18.1 -> 0.21.2
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/micromamba/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 016f07a7d33..4bdf7c4c7a3 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -21,16 +21,25 @@ let }) ]; }); + + spdlog' = spdlog.overrideAttrs (oldAttrs: { + # Required for header files. See alse: + # https://github.com/gabime/spdlog/pull/1241 (current solution) + # https://github.com/gabime/spdlog/issues/1897 (previous solution) + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DSPDLOG_FMT_EXTERNAL=OFF" + ]; + }); in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.18.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = version; - sha256 = "1gr9r257l300hafp8zm61bn58rysdk9i4wv1879q96b6n6v8hwa6"; + rev = "mamba-" + version; + sha256 = "0zsl0rhsx87vvwcwc1xn7gqgbxffprr8dyc9rkr6kcr4rjgy9yzp"; }; nativeBuildInputs = [ cmake ]; @@ -43,17 +52,11 @@ stdenv.mkDerivation rec { libyamlcpp libsolv' reproc - spdlog + spdlog' termcolor ghc_filesystem ]; - postPatch = '' - # See https://github.com/gabime/spdlog/issues/1897 - sed -i '1a add_compile_definitions(SPDLOG_FMT_EXTERNAL)' CMakeLists.txt - echo 'target_link_libraries(micromamba PRIVATE -lspdlog -lfmt)' >> micromamba/CMakeLists.txt - ''; - cmakeFlags = [ "-DBUILD_LIBMAMBA=ON" "-DBUILD_SHARED=ON" |