Merge pull request #39663 from xeji/xen-4-10-memfd

xen_4_10: fix qemu-xen build error (memfd)
This commit is contained in:
xeji 2018-05-02 05:29:43 +02:00 committed by GitHub
commit f50e688816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -29,6 +29,12 @@ let
xsa = import ./xsa-patches.nix { inherit fetchpatch; };
qemuMemfdBuildFix = fetchpatch {
name = "xen-4.8-memfd-build-fix.patch";
url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch;
sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa";
};
qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib glib python2
@ -53,6 +59,9 @@ callPackage (import ./generic.nix (rec {
rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2";
sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w";
};
patches = [
qemuMemfdBuildFix
];
buildInputs = qemuDeps;
postPatch = ''
# needed in build but /usr/bin/env is not available in sandbox