Skip to content

Commit de18642

Browse files
committed
qemu: use apple-sdk_13; fix build (#367606)
2 parents 0cb387f + b1c19ac commit de18642

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

pkgs/applications/virtualization/qemu/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
, sigtool
55
, makeWrapper, removeReferencesTo
66
, attr, libcap, libcap_ng, socat, libslirp
7-
, CoreServices, Cocoa, Hypervisor, Kernel, rez, setfile, vmnet
7+
, apple-sdk_13, rez, setfile
88
, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal
99
, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl
1010
, seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
102102
++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ]
103103
++ lib.optionals (!userOnly) [ curl ]
104104
++ lib.optionals ncursesSupport [ ncurses ]
105-
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel vmnet ]
105+
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]
106106
++ lib.optionals seccompSupport [ libseccomp ]
107107
++ lib.optionals numaSupport [ numactl ]
108108
++ lib.optionals alsaSupport [ alsa-lib ]

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15183,17 +15183,8 @@ with pkgs;
1518315183
eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
1518415184

1518515185
qemu = callPackage ../applications/virtualization/qemu {
15186-
inherit (darwin.apple_sdk_12_3.frameworks) CoreServices Cocoa Hypervisor Kernel vmnet;
1518715186
inherit (darwin.stubs) rez setfile;
1518815187
inherit (darwin) sigtool;
15189-
stdenv =
15190-
if stdenv.hostPlatform.isDarwin then
15191-
overrideSDK stdenv {
15192-
darwinSdkVersion = "12.3";
15193-
darwinMinVersion = "12.0";
15194-
}
15195-
else
15196-
stdenv;
1519715188
};
1519815189

1519915190
qemu-python-utils = python3Packages.toPythonApplication (

0 commit comments

Comments
 (0)