diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-02 05:29:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 05:29:43 +0200 |
| commit | f50e6888163f743805b9f550dc80744a9f691340 (patch) | |
| tree | 563595d93c3e6d6ceae59947856c3318d900315c /pkgs | |
| parent | ccd986d0c50b3aa0280059e929bd5f2801aba8d4 (diff) | |
| parent | 3c4efe448d96693cd370b3994c0b9087970e1e83 (diff) | |
| download | nixlib-f50e6888163f743805b9f550dc80744a9f691340.tar nixlib-f50e6888163f743805b9f550dc80744a9f691340.tar.gz nixlib-f50e6888163f743805b9f550dc80744a9f691340.tar.bz2 nixlib-f50e6888163f743805b9f550dc80744a9f691340.tar.lz nixlib-f50e6888163f743805b9f550dc80744a9f691340.tar.xz nixlib-f50e6888163f743805b9f550dc80744a9f691340.tar.zst nixlib-f50e6888163f743805b9f550dc80744a9f691340.zip | |
Merge pull request #39663 from xeji/xen-4-10-memfd
xen_4_10: fix qemu-xen build error (memfd)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/xen/4.10.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index c3280cbda94b..dab90a1ed781 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -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 |