Unverified Commit de186421 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

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

parents 0cb387f1 b1c19ac8

pkgs/applications/virtualization/qemu/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ]

pkgs/top-level/all-packages.nix

+0 −9
Original line number Diff line number Diff line
@@ -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 (