diff --git a/pkgs/by-name/qe/qemu/package.nix b/pkgs/by-name/qe/qemu/package.nix index 5bd6c6e0f8c7..80362ffd6757 100644 --- a/pkgs/by-name/qe/qemu/package.nix +++ b/pkgs/by-name/qe/qemu/package.nix @@ -123,6 +123,9 @@ minimal ? toolsOnly || userOnly, gitUpdater, qemu-utils, # for tests attribute + + # TODO: Clean up on `staging`. + llvmPackages, }: assert lib.assertMsg ( @@ -180,6 +183,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool + + # TODO: Clean up on `staging`. + llvmPackages.lld ] ++ lib.optionals (!userOnly) [ dtc ]; @@ -425,6 +431,10 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + passthru = { qemu-system-i386 = "bin/qemu-system-i386"; tests = lib.optionalAttrs (!toolsOnly) {