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

Merge pull request #112096 from r-burns/musl-nix

Browse Source 
nix: fix build on musl platforms
This commit is contained in:
Sandro 2021-02-23 07:22:49 +01:00 committed by GitHub
commit 40bc4f78f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/aws-c-common/default.nix
View File

@ -26,5 +26,7 @@ stdenv.mkDerivation rec {
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ orivej eelco ]; maintainers = with maintainers; [ orivej eelco ];
# https://github.com/awslabs/aws-c-common/issues/754
broken = stdenv.hostPlatform.isMusl;
}; };
} }

2
pkgs/tools/package-management/nix/default.nix
View File

@ -22,7 +22,7 @@ common =
, stateDir , stateDir
, confDir , confDir
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , 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 , enableStatic ? stdenv.hostPlatform.isStatic
, name, suffix ? "", src , name, suffix ? "", src
, patches ? [ ] , patches ? [ ]