From c0a2b079affe8397f6160baa075a7f017ad0ae9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Nov 2024 15:59:26 +0100 Subject: [PATCH] nixStatic: fix darwin build --- pkgs/tools/package-management/nix/common.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 62b8e2dbcf3a3..1f68cb68ef92c 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -53,6 +53,7 @@ in , gnutar , gtest , gzip +, iconv , jq , lib , libarchive @@ -163,6 +164,20 @@ self = stdenv.mkDerivation { aws-sdk-cpp ] ++ lib.optional (atLeast218 && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.libs.sandbox + ] ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) [ + # libarchive requires a iconv.pc file to be present + (pkgs.runCommand "iconv-pkgconfig" {} '' + mkdir -p $out/lib/pkgconfig + cat > $out/lib/pkgconfig/iconv.pc <