Unverified Commit 561a54f3 authored by Emily's avatar Emily Committed by GitHub
Browse files

lib/systems: use a shell script for native `emulator` (#357309)

parents d1e5e11a 302bcdf8

lib/systems/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.execline}/bin/exec"

          then pkgs.writeShellScript "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

pkgs/test/cc-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"}";