Do not use top-level buildPythonPackage or buildPythonApplication

but instead use the one in pythonPackages.
This commit is contained in:
Frederik Rietdijk
2016-09-26 11:10:51 +02:00
parent 2f4da5bd83
commit 3ba16c8234
22 changed files with 68 additions and 83 deletions
+6 -8
View File
@@ -1,9 +1,8 @@
{ stdenv, fetchFromGitHub, buildPythonPackage
, pexpect, pyGtkGlade, pygobject, pyxdg
, gnome_python, python
{ stdenv, fetchFromGitHub, pythonPackages
, gnome_python
, libappindicator-gtk2, xflux, librsvg, wrapGAppsHook
}:
buildPythonPackage rec {
pythonPackages.buildPythonApplication rec {
name = "xflux-gui-${version}";
version = "2016-09-21";
@@ -14,11 +13,10 @@ buildPythonPackage rec {
sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r";
};
# not sure if these need to be propagated or not?
propagatedBuildInputs = [
propagatedBuildInputs = with pythonPackages; [
pexpect
pyGtkGlade
pygobject
pygobject2
pyxdg
libappindicator-gtk2
gnome_python
@@ -36,7 +34,7 @@ buildPythonPackage rec {
wrapGAppsHook
makeWrapperArgs="''${gappsWrapperArgs[@]}"
wrapPythonPrograms
patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py
patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py
'';
meta = {