dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

qemu: fix cross compilation

Browse Source
This commit is contained in:
Nick Cao 2021-11-28 17:40:29 +08:00
parent 8d2ea10d45
commit f90a24f944
No known key found for this signature in database
GPG Key ID: 068A56CEF48FA2C1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib { lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages
, perl, pixman, vde2, alsa-lib, texinfo, flex , perl, pixman, vde2, alsa-lib, texinfo, flex
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool
, makeWrapper, runtimeShell , makeWrapper, runtimeShell
@ -51,7 +51,9 @@ stdenv.mkDerivation rec {
sha256 = "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f"; sha256 = "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f";
}; };
nativeBuildInputs = [ makeWrapper python python.pkgs.sphinx python.pkgs.sphinx_rtd_theme pkg-config flex bison meson ninja ] depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ makeWrapper pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ]
++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals gtkSupport [ wrapGAppsHook ]
++ lib.optionals stdenv.isDarwin [ sigtool ]; ++ lib.optionals stdenv.isDarwin [ sigtool ];
@ -190,6 +192,8 @@ stdenv.mkDerivation rec {
# Always use our Meson, not the bundled version, which doesn't # Always use our Meson, not the bundled version, which doesn't
# have our patches and will be subtly broken because of that. # have our patches and will be subtly broken because of that.
"--meson=meson" "--meson=meson"
"--cross-prefix=${stdenv.cc.targetPrefix}"
"--cpu=${stdenv.hostPlatform.uname.processor}"
] ++ lib.optional numaSupport "--enable-numa" ] ++ lib.optional numaSupport "--enable-numa"
++ lib.optional seccompSupport "--enable-seccomp" ++ lib.optional seccompSupport "--enable-seccomp"
++ lib.optional smartcardSupport "--enable-smartcard" ++ lib.optional smartcardSupport "--enable-smartcard"

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

@ -28070,7 +28070,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor;
inherit (darwin.stubs) rez setfile; inherit (darwin.stubs) rez setfile;
inherit (darwin) sigtool; inherit (darwin) sigtool;
python = python3;
}; };
qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {};