3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #36353 from xeji/xen-4-8

xen 4.8: fix gcc7-related build errors
This commit is contained in:
Jörg Thalheim 2018-03-05 23:55:11 +00:00 committed by GitHub
commit c7a92f3fee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -29,6 +29,18 @@ let
xsa = import ./xsa-patches.nix { inherit fetchpatch; };
xenlockprofpatch = (fetchpatch {
name = "xenlockprof-gcc7.patch";
url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222";
sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70";
});
xenpmdpatch = (fetchpatch {
name = "xenpmd-gcc7.patch";
url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3";
sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq";
});
qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib
@ -158,6 +170,8 @@ callPackage (import ./generic.nix (rec {
XSA_249
XSA_250
XSA_251_48
xenlockprofpatch
xenpmdpatch
];
# Fix build on Glibc 2.24.