aws-c-common: 0.6.9 -> 0.6.12, cleanup

* add setup hook for interface cmake module
* sba_metrics fails on musl

6 files changed, 19 insertions, 8 deletions

diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix
index 6f3df977efa..d0bcfc90108 100644
--- a/pkgs/development/libraries/aws-c-cal/default.nix
+++ b/pkgs/development/libraries/aws-c-cal/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
-    "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix
index ae47959dd3a..323b6001407 100644
--- a/pkgs/development/libraries/aws-c-common/default.nix
+++ b/pkgs/development/libraries/aws-c-common/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-c-common";
-  version = "0.6.9";
+  version = "0.6.12";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM=";
+    sha256 = "sha256-Bbb6YbPMpzVy+Pa9OGe62TXihTbUeKTlPS29sa70aQ8=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -23,10 +23,20 @@ stdenv.mkDerivation rec {
     "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
   ];
 
+  # aws-c-common misuses cmake modules, so we need
+  # to manually add a MODULE_PATH to its consumers
+  setupHook = ./setup-hook.sh;
+
   # Prevent the execution of tests known to be flaky.
-  preCheck = ''
+  preCheck = let
+    ignoreTests = [
+      "promise_test_multiple_waiters"
+    ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+      "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839
+    ];
+  in ''
     cat <<EOW >CTestCustom.cmake
-    SET(CTEST_CUSTOM_TESTS_IGNORE promise_test_multiple_waiters)
+    SET(CTEST_CUSTOM_TESTS_IGNORE ${toString ignoreTests})
     EOW
   '';
 
diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh
new file mode 100644
index 00000000000..e670f7cf852
--- /dev/null
+++ b/pkgs/development/libraries/aws-c-common/setup-hook.sh
@@ -0,0 +1,5 @@
+addAwsCCommonModuleDir() {
+    cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}"
+}
+
+postHooks+=(addAwsCCommonModuleDir)
diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix
index b6468a8dae0..24cb52d61a6 100644
--- a/pkgs/development/libraries/aws-c-event-stream/default.nix
+++ b/pkgs/development/libraries/aws-c-event-stream/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS:BOOL=ON"
-    "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix
index 012d96fca4d..02f5f777d57 100644
--- a/pkgs/development/libraries/aws-c-io/default.nix
+++ b/pkgs/development/libraries/aws-c-io/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
-    "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix
index 75b26695e2f..9042dc56154 100644
--- a/pkgs/development/libraries/aws-checksums/default.nix
+++ b/pkgs/development/libraries/aws-checksums/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
-    "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake"
   ];
 
   meta = with lib; {