diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-26 11:09:25 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-26 11:10:51 +0200 |
| commit | 3ba16c8234fdb5a49dde2501d3425eff0e5624a4 (patch) | |
| tree | f6eb2b09208eaf888cf1b5eb3ada3b74d3fca964 /pkgs/tools/misc | |
| parent | 2f4da5bd8370cfe6def9aeed717aef26763d7ee9 (diff) | |
| download | nixlib-3ba16c8234fdb5a49dde2501d3425eff0e5624a4.tar nixlib-3ba16c8234fdb5a49dde2501d3425eff0e5624a4.tar.gz nixlib-3ba16c8234fdb5a49dde2501d3425eff0e5624a4.tar.bz2 nixlib-3ba16c8234fdb5a49dde2501d3425eff0e5624a4.tar.lz nixlib-3ba16c8234fdb5a49dde2501d3425eff0e5624a4.tar.xz nixlib-3ba16c8234fdb5a49dde2501d3425eff0e5624a4.tar.zst nixlib-3ba16c8234fdb5a49dde2501d3425eff0e5624a4.zip | |
Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/i3minator/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/togglesg-download/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/xflux/gui.nix | 14 |
3 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index e51150d68769..0b26dbc06e2b 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages, python }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "i3minator-${version}"; version = "0.0.4"; diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index 14b9b1fcd9df..e945e560f1b0 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonApplication, makeWrapper, ffmpeg_3 }: +{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "togglesg-download-git-${version}"; version = "2016-05-31"; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 2b18d4e910d5..1fd3b3d8371f 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -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 = { |