edk2: use python env

This commit is contained in:
Frederik Rietdijk 2016-10-13 10:47:07 +02:00
parent cffdffe1f6
commit ffa65afdcd

View file

@ -1,6 +1,7 @@
{ stdenv, fetchgit, libuuid, python, iasl }: { stdenv, fetchgit, libuuid, python, iasl }:
let let
pythonEnv = python.withPackages(ps: [ps.tkinter]);
targetArch = if stdenv.isi686 then targetArch = if stdenv.isi686 then
"IA32" "IA32"
@ -18,7 +19,7 @@ edk2 = stdenv.mkDerivation {
sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb"; sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb";
}; };
buildInputs = [ libuuid python python.tkinter ]; buildInputs = [ libuuid pythonEnv];
makeFlags = "-C BaseTools"; makeFlags = "-C BaseTools";
@ -40,7 +41,7 @@ edk2 = stdenv.mkDerivation {
passthru = { passthru = {
setup = projectDscPath: attrs: { setup = projectDscPath: attrs: {
buildInputs = [ python python.tkinter ] ++ buildInputs = [ pythonEnv ] ++
stdenv.lib.optionals (attrs ? buildInputs) attrs.buildInputs; stdenv.lib.optionals (attrs ? buildInputs) attrs.buildInputs;
configurePhase = '' configurePhase = ''