From efef8e996351d2924650d9cb61ca734aa9cecb46 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Wed, 30 Dec 2020 07:08:49 -0800 Subject: [PATCH] librepo: enable zchunk support on darwin --- pkgs/tools/package-management/librepo/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index f636560844b2..203d5e20f881 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -38,9 +38,8 @@ stdenv.mkDerivation rec { curl check gpgme - ] - # zchunk currently has issues compiling in darwin, fine in linux - ++ stdenv.lib.optional stdenv.isLinux zchunk; + zchunk + ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here propagatedBuildInputs = [ @@ -49,9 +48,7 @@ stdenv.mkDerivation rec { libxml2 ]; - cmakeFlags = [ - "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" - ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF"; + cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ]; postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py"