git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112096 from r-burns/musl-nix

nix: fix build on musl platforms

commit40bc4f78f24ff7c34b5e9bbca328b4a756c89187 authorSandro <sandro.jaeckel@gmail.com> dateTue 23 Feb 2021, 07:22 (6 years ago) parent8e1b8197426b18
2 files changed+3−1
compare with master
unifiedsplit
pkgs/development/libraries/aws-c-common/default.nix+2 pkgs/tools/package-management/nix/default.nix+1−1
pkgs/development/libraries/aws-c-common/default.nix+2
@@ -26,5 +26,7 @@ stdenv.mkDerivation rec {
2626 license = licenses.asl20;
2727 platforms = platforms.unix;
2828 maintainers = with maintainers; [ orivej eelco ];
29+ # https://github.com/awslabs/aws-c-common/issues/754
30+ broken = stdenv.hostPlatform.isMusl;
2931 };
3032}
pkgs/tools/package-management/nix/default.nix+1−1
@@ -22,7 +22,7 @@ common =
2222 , stateDir
2323 , confDir
2424 , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
25− , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
25+ , withAWS ? !enableStatic && !stdenv.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
2626 , enableStatic ? stdenv.hostPlatform.isStatic
2727 , name, suffix ? "", src
2828 , patches ? [ ]