Commit f70071e4 authored by dramforever's avatar dramforever
Browse files

qemu: fix cross compilation, again 

The python dependencies were fixed for cross in #147692, but the changes
are reversed #190560 due to concerns of accidentally mixing python
versions. Compromise by using python3Packages.python.
parent e8e855a7

pkgs/applications/virtualization/qemu/default.nix

+8 −2
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 ];