ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

pkgsStatic.curl: fix build

Browse Source 
904625852d removed the overlay which
disables gss and brotli for static curl. Although we can now build them
statically, attempting to build curl against them results in 'undefined
reference' linker errors.
This commit is contained in:
Ryan Burns 2021-09-06 13:40:46 -07:00 committed by Raphael Megzari
parent 09f5763784
commit 42155910a0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/networking/curl/default.nix
View File

@ -145,5 +145,7 @@ stdenv.mkDerivation rec {
license = licenses.curl;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
# Fails to link against static brotli or gss
broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport);
};
}

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

@ -4109,11 +4109,12 @@ with pkgs;
ldapSupport = true;
};
curl = curlMinimal.override {
curl = curlMinimal.override ({
idnSupport = true;
} // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
gssSupport = true;
brotliSupport = true;
};
});
curlMinimal = callPackage ../tools/networking/curl { };