Skip to content

Commit

Permalink
qemu: use apple-sdk_13; fix build (NixOS#367606)
Browse files Browse the repository at this point in the history
  • Loading branch information
vcunat committed Dec 23, 2024
2 parents 0cb387f + b1c19ac commit de18642
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/qemu/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, sigtool
, makeWrapper, removeReferencesTo
, attr, libcap, libcap_ng, socat, libslirp
, CoreServices, Cocoa, Hypervisor, Kernel, rez, setfile, vmnet
, apple-sdk_13, rez, setfile
, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal
, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl
, seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp
Expand Down Expand Up @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ]
++ lib.optionals (!userOnly) [ curl ]
++ lib.optionals ncursesSupport [ ncurses ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel vmnet ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]
++ lib.optionals seccompSupport [ libseccomp ]
++ lib.optionals numaSupport [ numactl ]
++ lib.optionals alsaSupport [ alsa-lib ]
Expand Down
9 changes: 0 additions & 9 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15183,17 +15183,8 @@ with pkgs;
eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };

qemu = callPackage ../applications/virtualization/qemu {
inherit (darwin.apple_sdk_12_3.frameworks) CoreServices Cocoa Hypervisor Kernel vmnet;
inherit (darwin.stubs) rez setfile;
inherit (darwin) sigtool;
stdenv =
if stdenv.hostPlatform.isDarwin then
overrideSDK stdenv {
darwinSdkVersion = "12.3";
darwinMinVersion = "12.0";
}
else
stdenv;
};

qemu-python-utils = python3Packages.toPythonApplication (
Expand Down

0 comments on commit de18642

Please sign in to comment.