From d7b0a7f5017f3a4f3d79e1f90aeb14537372dee0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:18 +0200 Subject: [PATCH 01/23] eiwd: use stdenv.buildPlatform.canExecute --- pkgs/by-name/ei/eiwd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix index c2d54101db63..281837fd4bd4 100644 --- a/pkgs/by-name/ei/eiwd/package.nix +++ b/pkgs/by-name/ei/eiwd/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; # override this to false if you don't want to build python3 - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # prevent the `install-data-local` Makefile rule from running; # all it does is attempt to `mkdir` the `localstatedir`. From a6f72e581fb6f0b7d55173f4249410edb2971a32 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:19 +0200 Subject: [PATCH 02/23] ffmpeg_7-full: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index b0ccaeeb45fb..28a08cb0d2f5 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -840,7 +840,7 @@ stdenv.mkDerivation (finalAttrs: { ]; }; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let From 80a7af371531699e25539f73b7e8ac92e1c39b71 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:19 +0200 Subject: [PATCH 03/23] flatbuffers_23: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/flatbuffers/23.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flatbuffers/23.nix b/pkgs/development/libraries/flatbuffers/23.nix index 5263694b0562..4e30c3dd37b6 100644 --- a/pkgs/development/libraries/flatbuffers/23.nix +++ b/pkgs/development/libraries/flatbuffers/23.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { From 59dd05ed24bd5c764e9e3abff8463bcd44b364d8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:19 +0200 Subject: [PATCH 04/23] flatbuffers_2_0: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/flatbuffers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 00bb9cc8d187..58ea13a50b92 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { From 9109a87f53f549b740716bc8d3cea1632dd5e44e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:19 +0200 Subject: [PATCH 05/23] fossil: use stdenv.buildPlatform.canExecute --- pkgs/applications/version-management/fossil/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 9443c1e9cdea..a00cc8e78cc7 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; configureFlags = lib.optional (!withInternalSqlite) "--disable-internal-sqlite" From 2e685bbac17ea8e283912f8f8782bf9d6636ee38 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:19 +0200 Subject: [PATCH 06/23] glab: use stdenv.buildPlatform.canExecute --- pkgs/by-name/gl/glab/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index c0a321858f0e..444f916bb7be 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -28,7 +28,7 @@ buildGo123Module rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' make manpage installManPage share/man/man1/* installShellCompletion --cmd glab \ From 1ea118d88f03b65924e1fb95c18bc81bca8807f4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:20 +0200 Subject: [PATCH 07/23] k6: use stdenv.buildPlatform.canExecute --- pkgs/development/tools/k6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 291c28c0bf25..48ea4c103f31 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { $out/bin/k6 version | grep ${version} > /dev/null ''; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd k6 \ --bash <($out/bin/k6 completion bash) \ --fish <($out/bin/k6 completion fish) \ From 4d672b2560f529eab0ce8410580c24572da3824f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:20 +0200 Subject: [PATCH 08/23] kaniko: use stdenv.buildPlatform.canExecute --- pkgs/applications/networking/cluster/kaniko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 2d9136484e22..24779b603511 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { doCheck = false; # requires docker, container-diff (unpackaged yet) - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash fish zsh; do $out/bin/executor completion $shell > executor.$shell installShellCompletion executor.$shell From 7ef881b7efa3f465d372d23ad211a0c4c02a2d22 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:20 +0200 Subject: [PATCH 09/23] kmymoney: use stdenv.buildPlatform.canExecute --- pkgs/applications/office/kmymoney/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index a910d76b29c9..86547c638dfa 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "kmymoney/plugins/woob/interface/kmymoneywoob.py" ''; - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeInstallCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' From a91427558d68cb30c8beeb6d734824956cf650ba Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:20 +0200 Subject: [PATCH 10/23] kubeshark: use stdenv.buildPlatform.canExecute --- pkgs/applications/networking/cluster/kubeshark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 27eb93f11824..e8156c872c2c 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { ''; doCheck = true; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd kubeshark \ --bash <($out/bin/kubeshark completion bash) \ --fish <($out/bin/kubeshark completion fish) \ From fe7e01bda1bc8a0ae1c6c211f234eda0d4aae1df Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:20 +0200 Subject: [PATCH 11/23] kubevela: use stdenv.buildPlatform.canExecute --- pkgs/applications/networking/cluster/kubevela/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/applications/networking/cluster/kubevela/default.nix index 75e68b3c1944..b61535492b1e 100644 --- a/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/pkgs/applications/networking/cluster/kubevela/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd vela \ --bash <($out/bin/vela completion bash) \ --zsh <($out/bin/vela completion zsh) From b80f0edf72c4966e4b04f65e508cd3053f1977c0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:20 +0200 Subject: [PATCH 12/23] mangal: use stdenv.buildPlatform.canExecute --- pkgs/by-name/ma/mangal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix index c1d7c1540508..332c1d33ec25 100644 --- a/pkgs/by-name/ma/mangal/package.nix +++ b/pkgs/by-name/ma/mangal/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' # Mangal creates a config file in the folder ~/.config/mangal and fails if not possible export HOME=$(mktemp -d) installShellCompletion --cmd mangal \ From faa7f0f8b7991acdee82ac5e2bde4fb420242c2e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:21 +0200 Subject: [PATCH 13/23] mtdutils: use stdenv.buildPlatform.canExecute --- pkgs/by-name/mt/mtdutils/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mt/mtdutils/package.nix b/pkgs/by-name/mt/mtdutils/package.nix index 15359970cfca..3347739d81c3 100644 --- a/pkgs/by-name/mt/mtdutils/package.nix +++ b/pkgs/by-name/mt/mtdutils/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR:=$(AR)" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; outputs = [ "out" From 8a3a11c3267b14f97086332bdba03ea211cbc692 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:21 +0200 Subject: [PATCH 14/23] nlohmann_json: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/nlohmann_json/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 339db2bb0879..d690cc45b2f9 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DJSON_MultipleHeaders=ON" ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}"; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # skip tests that require git or modify “installed files” preCheck = '' From 60c99f1abd322a70e04b5ee8613146b4afb8095f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:21 +0200 Subject: [PATCH 15/23] pidgin: use stdenv.buildPlatform.canExecute --- .../networking/instant-messengers/pidgin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index c2c8f98251b6..e999c27cfb09 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -117,7 +117,7 @@ let --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # In particular, this detects missing python imports in some of the tools. postFixup = let # TODO: python is a script, so it doesn't work as interpreter on darwin From 2d992c6fdde9ce4b4803e5e68b64ef899f64b948 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:21 +0200 Subject: [PATCH 16/23] utox: use stdenv.buildPlatform.canExecute --- .../applications/networking/instant-messengers/utox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 706904a8dd2c..259735919cd5 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeCheckInputs = [ check ]; meta = with lib; { From 56783f8200b0c883b0ecf23b2eb69127e98b8327 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:21 +0200 Subject: [PATCH 17/23] velero: use stdenv.buildPlatform.canExecute --- pkgs/by-name/ve/velero/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index 65934fb56b8c..357c68d3c8c7 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/velero completion bash > velero.bash $out/bin/velero completion zsh > velero.zsh installShellCompletion velero.{bash,zsh} From 66c524ac401505651b180c5ab82ab0bb2bf5f60e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:34:21 +0200 Subject: [PATCH 18/23] zerotierone: use stdenv.buildPlatform.canExecute --- pkgs/by-name/ze/zerotierone/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index 728ec4ee3c37..3252cce49d60 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -115,7 +115,7 @@ in stdenv.mkDerivation { buildFlags = [ "all" "selftest" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck ./zerotier-selftest From 191df7805ef768162ad63e42509a6339ce3ad6c8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:47:19 +0200 Subject: [PATCH 19/23] bencodetools: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/bencodetools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/bencodetools/default.nix b/pkgs/development/libraries/bencodetools/default.nix index 7a826efa7ef7..b6a9ab68dda0 100644 --- a/pkgs/development/libraries/bencodetools/default.nix +++ b/pkgs/development/libraries/bencodetools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ]; # installCheck instead of check due to -install_name'd library on Darwin - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckTarget = "check"; meta = with lib; { From bb16748e8cfd5d74905f451e4d65be4a0737dcc4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:47:19 +0200 Subject: [PATCH 20/23] minizip2: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/minizip-ng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index b15997cb436b..ffc6665af42a 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { fi ''; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeCheckInputs = [ gtest ]; enableParallelChecking = false; From 4b43b3c102f66d4074fa24a9467a5f6230ff074b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:47:20 +0200 Subject: [PATCH 21/23] tpm2-tss: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/tpm2-tss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 79abe0f827b8..c1f3aeb7a34a 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ''; doCheck = false; - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Since we rewrote the load path in the dynamic loader for the TCTI # The various tcti implementation should be placed in their target directory # before we could run tests, so we make turn checkPhase into installCheckPhase From 22c69ed6b271b2c1504fdebc7e9e2b2a7438ada1 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:47:20 +0200 Subject: [PATCH 22/23] uriparser: use stdenv.buildPlatform.canExecute --- pkgs/development/libraries/uriparser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index dd93f49f5946..370a1dfe4ea9 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; nativeCheckInputs = [ gtest ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog"; From e77269f1f1efc749b90f04b958385b1b7344cd49 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Oct 2024 11:47:20 +0200 Subject: [PATCH 23/23] visidata: use stdenv.buildPlatform.canExecute --- pkgs/applications/misc/visidata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index d7a7c4d9f75f..4cc054162547 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -126,7 +126,7 @@ buildPythonApplication rec { ]; # check phase uses the output bin, which is not possible when cross-compiling - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck