From 302bcdf85da7ecf4c8174895e8e2f60227a9de84 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 19 Nov 2024 15:40:38 +0000 Subject: [PATCH] Revert "tests.cc-wrapper.default: reduce rebuild amount from `429` to `319`" Now that we use a trivial shell script, this only adds two trivial builds to the closure. This reverts commit 5f2d5d77da18a89fc1378defa4c2e066a8180bab. --- pkgs/test/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 9f477ccdc3b3..22991e0dc07d 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -8,7 +8,7 @@ let || (stdenv.cc.isGNU && stdenv.hostPlatform.isLinux) ); staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; - emulator = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (stdenv.hostPlatform.emulator buildPackages); + emulator = stdenv.hostPlatform.emulator buildPackages; isCxx = stdenv.cc.libcxx != null; libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx"; CC = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"}";