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

Merge pull request #115157 from r-burns/aws-c-common-musl

Browse Source
This commit is contained in:
Jörg Thalheim 2021-03-06 11:11:31 +00:00 committed by GitHub
commit a97a7cd168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aws-c-common"; pname = "aws-c-common";
version = "0.4.64"; version = "0.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A="; sha256 = "0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg";
}; };
patches = [ patches = [
@ -23,18 +23,19 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
]; ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
"-Wno-nullability-extension -Wno-typedef-redefinition"; "-Wno-nullability-extension -Wno-typedef-redefinition";
doCheck = true;
meta = with lib; { meta = with lib; {
description = "AWS SDK for C common core"; description = "AWS SDK for C common core";
homepage = "https://github.com/awslabs/aws-c-common"; homepage = "https://github.com/awslabs/aws-c-common";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ orivej eelco ]; maintainers = with maintainers; [ orivej eelco r-burns ];
# https://github.com/awslabs/aws-c-common/issues/754
broken = stdenv.hostPlatform.isMusl;
}; };
} }

4
pkgs/development/libraries/aws-c-io/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aws-c-io"; pname = "aws-c-io";
version = "0.7.1"; version = "0.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4="; sha256 = "0lx72p9xmmnjkz4zkfb1lz0ibw0jsy52qpydhvn56bq85nv44rwx";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

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.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
, enableStatic ? stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic
, name, suffix ? "", src , name, suffix ? "", src
, patches ? [ ] , patches ? [ ]