diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 233174d4083..4af3d612f81 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -183,14 +183,13 @@ rec { seccompSupport = false; hostCpuTargets = [ "${final.qemuArch}-linux-user" ]; }; - wine-name = "wine${toString final.parsed.cpu.bits}"; - wine = (pkgs.winePackagesFor wine-name).minimal; + wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal; in if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && pkgs.stdenv.hostPlatform.canExecute final then "${pkgs.runtimeShell} -c '\"$@\"' --" else if final.isWindows - then "${wine}/bin/${wine-name}" + then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}" else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux then "${qemu-user}/bin/qemu-${final.qemuArch}" else if final.isWasi