Commit 376b49ee authored by Julius Michaelis's avatar Julius Michaelis Committed by Alyssa Ross
Browse files

qemu: Skip dependencies unnecessary for qemu-user which fail in pkgsStatic (libaio, dtc)

parent dd5bc7b7

pkgs/applications/virtualization/qemu/default.nix

+9 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    makeWrapper removeReferencesTo

    pkg-config flex bison dtc meson ninja

    pkg-config flex bison meson ninja



    # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation

    python3Packages.python
@@ -81,9 +81,10 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ lib.optionals gtkSupport [ wrapGAppsHook3 ]

    ++ lib.optionals enableDocs [ python3Packages.sphinx python3Packages.sphinx-rtd-theme ]

    ++ lib.optionals hexagonSupport [ glib ]

    ++ lib.optionals stdenv.isDarwin [ sigtool ];

    ++ lib.optionals stdenv.isDarwin [ sigtool ]

    ++ lib.optionals (!userOnly) [ dtc ];



  buildInputs = [ dtc zlib glib pixman

  buildInputs = [ zlib glib pixman

    vde2 lzo snappy libtasn1

    gnutls nettle curl libslirp

  ]
@@ -101,7 +102,8 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ lib.optionals smartcardSupport [ libcacard ]

    ++ lib.optionals spiceSupport [ spice-protocol spice ]

    ++ lib.optionals usbredirSupport [ usbredir ]

    ++ lib.optionals stdenv.isLinux [ libaio libcap_ng libcap attr ]

    ++ lib.optionals stdenv.isLinux [ libcap_ng libcap attr ]

    ++ lib.optionals (stdenv.isLinux && !userOnly) [ libaio ]

    ++ lib.optionals xenSupport [ xen ]

    ++ lib.optionals cephSupport [ ceph ]

    ++ lib.optionals glusterfsSupport [ glusterfs libuuid ]
@@ -112,7 +114,8 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ lib.optionals smbdSupport [ samba ]

    ++ lib.optionals uringSupport [ liburing ]

    ++ lib.optionals canokeySupport [ canokey-qemu ]

    ++ lib.optionals capstoneSupport [ capstone ];

    ++ lib.optionals capstoneSupport [ capstone ]

    ++ lib.optionals (!userOnly) [ dtc ];



  dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
@@ -177,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ lib.optional usbredirSupport "--enable-usb-redir"

    ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}"

    ++ lib.optionals stdenv.isDarwin [ "--enable-cocoa" "--enable-hvf" ]

    ++ lib.optional stdenv.isLinux "--enable-linux-aio"

    ++ lib.optional (stdenv.isLinux && !userOnly) "--enable-linux-aio"

    ++ lib.optional gtkSupport "--enable-gtk"

    ++ lib.optional xenSupport "--enable-xen"

    ++ lib.optional cephSupport "--enable-rbd"