alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request #238480 from amjoseph-nixpkgs/pr/lib-systems-redundant

Browse source 
lib/systems: remove redundant test from selectEmulator
This commit is contained in:
Weijia Wang 2023-06-19 06:49:36 +03:00 • committed by GitHub
commit 50f3cc9407
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/systems/default.nix
View file

@ -226,8 +226,7 @@ rec {
}; };
wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal; wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;
in in
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name && if pkgs.stdenv.hostPlatform.canExecute final
pkgs.stdenv.hostPlatform.canExecute final
then "${pkgs.runtimeShell} -c '\"$@\"' --" then "${pkgs.runtimeShell} -c '\"$@\"' --"
else if final.isWindows else if final.isWindows
then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}" then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}"