diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2022-11-06 20:10:25 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2022-11-06 20:29:37 +0100 |
commit | 87f4f101d773a53c8639d7127ab2f9ee6371ef98 (patch) | |
tree | e7db1a5ddbb7554e6f96636520d05a5dcaa25997 /lib | |
parent | 68c387c29857e1a3d04b493a15e51f32465424a4 (diff) | |
download | nixlib-87f4f101d773a53c8639d7127ab2f9ee6371ef98.tar nixlib-87f4f101d773a53c8639d7127ab2f9ee6371ef98.tar.gz nixlib-87f4f101d773a53c8639d7127ab2f9ee6371ef98.tar.bz2 nixlib-87f4f101d773a53c8639d7127ab2f9ee6371ef98.tar.lz nixlib-87f4f101d773a53c8639d7127ab2f9ee6371ef98.tar.xz nixlib-87f4f101d773a53c8639d7127ab2f9ee6371ef98.tar.zst nixlib-87f4f101d773a53c8639d7127ab2f9ee6371ef98.zip |
cross/mingw: fix emulator for mingw32
Diffstat (limited to 'lib')
-rw-r--r-- | lib/systems/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 233174d40831..4af3d612f81b 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 |