From ffa65afdcd67a89f4b7f8f309e3dcc8a80ed98aa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 13 Oct 2016 10:47:07 +0200 Subject: [PATCH] edk2: use python env --- pkgs/development/compilers/edk2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 411c86249dd..bb211e55343 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchgit, libuuid, python, iasl }: let + pythonEnv = python.withPackages(ps: [ps.tkinter]); targetArch = if stdenv.isi686 then "IA32" @@ -18,7 +19,7 @@ edk2 = stdenv.mkDerivation { sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb"; }; - buildInputs = [ libuuid python python.tkinter ]; + buildInputs = [ libuuid pythonEnv]; makeFlags = "-C BaseTools"; @@ -40,7 +41,7 @@ edk2 = stdenv.mkDerivation { passthru = { setup = projectDscPath: attrs: { - buildInputs = [ python python.tkinter ] ++ + buildInputs = [ pythonEnv ] ++ stdenv.lib.optionals (attrs ? buildInputs) attrs.buildInputs; configurePhase = ''