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

Merge pull request #19309 from FRidh/outputs

Browse Source 
Python: use separate output for tkinter
This commit is contained in:
Frederik Rietdijk
2016-10-13 10:40:14 +02:00
committed by GitHub
parent 727fc259d6 1e544b2993
commit cffdffe1f6
28 changed files with 172 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/edk2/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, libuuid, pythonFull, iasl }:
{ stdenv, fetchgit, libuuid, python, iasl }:
let
@@ -18,7 +18,7 @@ edk2 = stdenv.mkDerivation {
sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb";
};
buildInputs = [ libuuid pythonFull ];
buildInputs = [ libuuid python python.tkinter ];
makeFlags = "-C BaseTools";
@@ -40,7 +40,7 @@ edk2 = stdenv.mkDerivation {
passthru = {
setup = projectDscPath: attrs: {
buildInputs = [ pythonFull ] ++
buildInputs = [ python python.tkinter ] ++
stdenv.lib.optionals (attrs ? buildInputs) attrs.buildInputs;
configurePhase = ''