From 206a4c9aba6772f01d175e72636d1283dc038cc0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 10 Aug 2017 12:55:46 +0200 Subject: [PATCH] Partly revert "python.buildEnv: only wrap executables" This partly reverts commit 4495bfe1382ea779f02996d0e18d25d892678e8c. The xen changes should not have been commited. --- pkgs/applications/virtualization/xen/packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index f4bde18f3df6..8f5262acb024 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -10,6 +10,8 @@ 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 = '' @@ -58,6 +60,8 @@ 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 = ''