public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35112 from oxij/pkgs/fix-xen

Browse Source 
xen_4_8: fix build
This commit is contained in:
Joachim F 2018-02-18 17:27:03 +00:00 committed by GitHub
commit 20815fc80b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/virtualization/xen/4.8.nix
View File

@ -49,15 +49,9 @@ callPackage (import ./generic.nix (rec {
src = fetchgit { src = fetchgit {
url = https://xenbits.xen.org/git-http/qemu-xen.git; url = https://xenbits.xen.org/git-http/qemu-xen.git;
rev = "refs/tags/qemu-xen-${version}"; rev = "refs/tags/qemu-xen-${version}";
sha256 = "1v19pp86kcgwvsbkrdrn4rlaj02i4054avw8k70w1m0rnwgcsdbs"; sha256 = "1l4sygd8p0mc13bskr4r1m31qh1kr58h195qn1s52869s58jyhvm";
}; };
buildInputs = qemuDeps; buildInputs = qemuDeps;
patches = [
(xsaPatch {
name = "216-qemuu";
sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn";
})
];
meta.description = "Xen's fork of upstream Qemu"; meta.description = "Xen's fork of upstream Qemu";
}; };
} // optionalAttrs withInternalTraditionalQemu { } // optionalAttrs withInternalTraditionalQemu {

4
pkgs/applications/virtualization/xen/packages.nix
View File

@ -58,10 +58,6 @@ rec {
}; };
xen_4_8-vanilla = callPackage ./4.8.nix { xen_4_8-vanilla = callPackage ./4.8.nix {
# At the very least included seabios and etherboot need gcc49,
# so we have to build all of it with gcc49.
stdenv = overrideCC stdenv gcc49;
meta = { meta = {
description = "vanilla"; description = "vanilla";
longDescription = '' longDescription = ''