gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu: use apple-sdk_13; fix build (#367606)

Browse Source
This commit is contained in:
Vladimír Čunát
2024-12-23 22:10:33 +01:00
parent 0cb387f143 b1c19ac8f9
commit de1864217b
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/qemu/default.nix
View File

@@ -4,7 +4,7 @@
, sigtool , sigtool
, makeWrapper, removeReferencesTo , makeWrapper, removeReferencesTo
, attr, libcap, libcap_ng, socat, libslirp , 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 , guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal
, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl , numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl
, seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp , 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 (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ]
++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals (!userOnly) [ curl ]
++ lib.optionals ncursesSupport [ ncurses ] ++ 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 seccompSupport [ libseccomp ]
++ lib.optionals numaSupport [ numactl ] ++ lib.optionals numaSupport [ numactl ]
++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals alsaSupport [ alsa-lib ]

9
pkgs/top-level/all-packages.nix
View File

@@ -15183,17 +15183,8 @@ with pkgs;
eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
qemu = callPackage ../applications/virtualization/qemu { qemu = callPackage ../applications/virtualization/qemu {
inherit (darwin.apple_sdk_12_3.frameworks) CoreServices Cocoa Hypervisor Kernel vmnet;
inherit (darwin.stubs) rez setfile; inherit (darwin.stubs) rez setfile;
inherit (darwin) sigtool; inherit (darwin) sigtool;
stdenv =
if stdenv.hostPlatform.isDarwin then
overrideSDK stdenv {
darwinSdkVersion = "12.3";
darwinMinVersion = "12.0";
}
else
stdenv;
}; };
qemu-python-utils = python3Packages.toPythonApplication ( qemu-python-utils = python3Packages.toPythonApplication (