diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-30 18:40:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 18:40:45 +0000 |
| commit | e75c8744cbcc437c40efadfe542b3c35206cdd7f (patch) | |
| tree | 00d3bc175b6e57c085faae4059dcd1857464db98 /pkgs/tools/package-management | |
| parent | 099a83cabadf39515aec2ef3ea97472235958000 (diff) | |
| parent | bee02826b8bf0e9e5a8565e62f1329b49ab8539b (diff) | |
| download | nixpkgs-e75c8744cbcc437c40efadfe542b3c35206cdd7f.tar nixpkgs-e75c8744cbcc437c40efadfe542b3c35206cdd7f.tar.gz nixpkgs-e75c8744cbcc437c40efadfe542b3c35206cdd7f.tar.bz2 nixpkgs-e75c8744cbcc437c40efadfe542b3c35206cdd7f.tar.lz nixpkgs-e75c8744cbcc437c40efadfe542b3c35206cdd7f.tar.xz nixpkgs-e75c8744cbcc437c40efadfe542b3c35206cdd7f.tar.zst nixpkgs-e75c8744cbcc437c40efadfe542b3c35206cdd7f.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/librepo/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index f636560844b..203d5e20f88 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" |