ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #293617 from iFreilicht/fix-zsync-clang

Browse Source 
zsync: fix build with clang + migrate to by-name
This commit is contained in:
Weijia Wang 2024-03-09 01:15:32 +01:00 committed by GitHub
commit b046a81451
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/compression/zsync/default.nix → pkgs/by-name/zs/zsync/package.nix
View File

@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
}; };
env = lib.optionalAttrs stdenv.cc.isClang {
# Suppress error "call to undeclared library function 'strcasecmp'" during compilation.
# The function is found by the linker correctly, so this doesn't introduce any issues.
NIX_CFLAGS_COMPILE = " -Wno-implicit-function-declaration";
};
makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
meta = with lib; { meta = with lib; {

2
pkgs/top-level/all-packages.nix
View File

@ -15219,8 +15219,6 @@ with pkgs;
zsv = callPackage ../development/tools/zsv { }; zsv = callPackage ../development/tools/zsv { };
zsync = callPackage ../tools/compression/zsync { };
zxing = callPackage ../tools/graphics/zxing { }; zxing = callPackage ../tools/graphics/zxing { };
zkar = callPackage ../tools/security/zkar { }; zkar = callPackage ../tools/security/zkar { };