Merge commit 'b1f5305abd7b1b3d7ed180d9d00301da6e323e41' into HEAD

2017-08-10 19:26:16 +02:00
parent 13704f578e b1f5305abd
commit 9f73f22c64
21 changed files with 405 additions and 239 deletions
@@ -10,8 +10,6 @@ rec {
  xen_4_5-vanilla = callPackage ./4.5.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 = {
      description = "vanilla";
      longDescription = ''
@@ -60,8 +58,6 @@ rec {
  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 = {
      description = "vanilla";
      longDescription = ''