Unverified Commit cc443761 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #214534 from dramforever/qemu-remove-cpu-flag

parents 014464d9 08e6d08a

pkgs/applications/virtualization/qemu/default.nix

+8 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, python3, zlib, pkg-config, glib, buildPackages

{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages

, perl, pixman, vde2, alsa-lib, texinfo, flex

, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool

, makeWrapper, runtimeShell, removeReferencesTo
@@ -51,7 +51,13 @@ stdenv.mkDerivation rec { 


  depsBuildBuild = [ buildPackages.stdenv.cc ];



  nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme ]

  nativeBuildInputs = [

    makeWrapper removeReferencesTo

    pkg-config flex bison meson ninja perl



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

    python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme

  ]

    ++ lib.optionals gtkSupport [ wrapGAppsHook ]

    ++ lib.optionals stdenv.isDarwin [ sigtool ];
@@ -143,7 +149,6 @@ stdenv.mkDerivation rec { 
    # have our patches and will be subtly broken because of that.

    "--meson=meson"

    "--cross-prefix=${stdenv.cc.targetPrefix}"

    "--cpu=${stdenv.hostPlatform.uname.processor}"

    (lib.enableFeature guestAgentSupport "guest-agent")

  ] ++ lib.optional numaSupport "--enable-numa"

    ++ lib.optional seccompSupport "--enable-seccomp"