mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge pull request #112096 from r-burns/musl-nix
nix: fix build on musl platforms
This commit is contained in:
commit
40bc4f78f2
@ -26,5 +26,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ orivej eelco ];
|
||||
# https://github.com/awslabs/aws-c-common/issues/754
|
||||
broken = stdenv.hostPlatform.isMusl;
|
||||
};
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ common =
|
||||
, stateDir
|
||||
, confDir
|
||||
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
|
||||
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
|
||||
, withAWS ? !enableStatic && !stdenv.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, name, suffix ? "", src
|
||||
, patches ? [ ]
|
||||
|
Loading…
Reference in New Issue
Block a user