From b1c19ac8f98d0f4dafecd6c2ad7faa764d7bac41 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 23 Dec 2024 02:48:37 -0800 Subject: [PATCH] qemu: use apple-sdk_13 qemu 9.2.0 uses hv_vm_config_get_default_ipa_size which showed up in macOS 13 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index df42117cc6d86..791c0308c2275 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -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 @@ -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 ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe929fcba7336..077a7b47b248b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 (