JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107972 from rb2k/zchunk_support

Browse Source 
librepo: enable zchunk support on darwin
This commit is contained in:
Pavol Rusnak 2020-12-30 17:41:22 +01:00 committed by GitHub
commit 6c71f432bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/package-management/librepo/default.nix
View File

@ -38,9 +38,8 @@ stdenv.mkDerivation rec {
curl curl
check check
gpgme gpgme
] zchunk
# zchunk currently has issues compiling in darwin, fine in linux ];
++ stdenv.lib.optional stdenv.isLinux zchunk;
# librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -49,9 +48,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
]; ];
cmakeFlags = [ cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ];
"-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"
] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF";
postFixup = '' postFixup = ''
moveToOutput "lib/${python.libPrefix}" "$py" moveToOutput "lib/${python.libPrefix}" "$py"