diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-05 23:55:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 23:55:11 +0000 |
| commit | c7a92f3fee460c55871fec2a6306d65a23f15017 (patch) | |
| tree | da2c59d35e274b40a3f0d0616dea603fb17da43f | |
| parent | 5fe1be88a53e7213e946600c08b2a9ba793ff921 (diff) | |
| parent | c84cf5f64254ffff18d5c0c647ff996a2c82644c (diff) | |
| download | nixlib-c7a92f3fee460c55871fec2a6306d65a23f15017.tar nixlib-c7a92f3fee460c55871fec2a6306d65a23f15017.tar.gz nixlib-c7a92f3fee460c55871fec2a6306d65a23f15017.tar.bz2 nixlib-c7a92f3fee460c55871fec2a6306d65a23f15017.tar.lz nixlib-c7a92f3fee460c55871fec2a6306d65a23f15017.tar.xz nixlib-c7a92f3fee460c55871fec2a6306d65a23f15017.tar.zst nixlib-c7a92f3fee460c55871fec2a6306d65a23f15017.zip | |
Merge pull request #36353 from xeji/xen-4-8
xen 4.8: fix gcc7-related build errors
| -rw-r--r-- | pkgs/applications/virtualization/xen/4.8.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index be6c4e3fcc7a..558510b30f50 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -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. |