From 2b1f3bb3426204135e750d7967cf04859e1d4383 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 23 Nov 2024 17:23:52 +0000 Subject: [PATCH] lib/systems: ensure native `emulator` is a string Fixes eval of `mesonEmulatorHook.crossFile`. --- lib/systems/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 8c48f507bbad..edd728dcee29 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -283,7 +283,7 @@ let # to an emulator program. That is, if an emulator requires additional # arguments, a wrapper should be used. if pkgs.stdenv.hostPlatform.canExecute final - then pkgs.writeShellScript "exec" ''exec "$@"'' + then lib.getExe (pkgs.writeShellScriptBin "exec" ''exec "$@"'') else if final.isWindows then "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}" else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null