pyrox.dev
Merge pull request #115157 from r-burns/aws-c-common-musl
authored by Jörg Thalheim and committed by GitHub a97a7cd1 158578de
+6
-5
pkgs/development/libraries/aws-c-common/default.nix
+6
-5
pkgs/development/libraries/aws-c-common/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "aws-c-common";
5
-
version = "0.4.64";
5
+
version = "0.5.2";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "awslabs";
9
9
repo = pname;
10
10
rev = "v${version}";
11
-
sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A=";
11
+
sha256 = "0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg";
12
12
};
13
13
14
14
patches = [
···
23
23
24
24
cmakeFlags = [
25
25
"-DBUILD_SHARED_LIBS=ON"
26
+
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
26
27
];
27
28
28
29
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
29
30
"-Wno-nullability-extension -Wno-typedef-redefinition";
30
31
32
+
doCheck = true;
33
+
31
34
meta = with lib; {
32
35
description = "AWS SDK for C common core";
33
36
homepage = "https://github.com/awslabs/aws-c-common";
34
37
license = licenses.asl20;
35
38
platforms = platforms.unix;
36
-
maintainers = with maintainers; [ orivej eelco ];
37
-
# https://github.com/awslabs/aws-c-common/issues/754
38
-
broken = stdenv.hostPlatform.isMusl;
39
+
maintainers = with maintainers; [ orivej eelco r-burns ];
39
40
};
40
41
}
+2
-2
pkgs/development/libraries/aws-c-io/default.nix
+2
-2
pkgs/development/libraries/aws-c-io/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "aws-c-io";
5
-
version = "0.7.1";
5
+
version = "0.9.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "awslabs";
9
9
repo = pname;
10
10
rev = "v${version}";
11
-
sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4=";
11
+
sha256 = "0lx72p9xmmnjkz4zkfb1lz0ibw0jsy52qpydhvn56bq85nv44rwx";
12
12
};
13
13
14
14
nativeBuildInputs = [ cmake ];
+1
-1
pkgs/tools/package-management/nix/default.nix
+1
-1
pkgs/tools/package-management/nix/default.nix
···
22
22
, stateDir
23
23
, confDir
24
24
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
25
-
, withAWS ? !enableStatic && !stdenv.hostPlatform.isMusl && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
25
+
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
26
26
, enableStatic ? stdenv.hostPlatform.isStatic
27
27
, name, suffix ? "", src
28
28
, patches ? [ ]