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/applications/graphics | |
| 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/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/mcomix/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/mirage/default.nix | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 88f3937335ba..c88c3337c928 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, python27Packages }: +{ stdenv, fetchurl, python27Packages }: -buildPythonApplication rec { - namePrefix = ""; +python27Packages.buildPythonApplication rec { name = "mcomix-${version}"; version = "1.2.1"; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index c3f06544bb4a..515b834b41ea 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonApplication, python, pygtk, pillow, libX11, gettext }: +{ stdenv, fetchurl, pythonPackages, libX11, gettext }: -buildPythonApplication rec { - namePrefix = ""; - name = "mirage-0.9.5.2"; +pythonPackages.buildPythonApplication rec { + name = "mirage-${version}"; + version = "0.9.5.2"; src = fetchurl { url = "mirror://sourceforge/mirageiv/${name}.tar.bz2"; @@ -17,7 +17,7 @@ buildPythonApplication rec { sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py ''; - propagatedBuildInputs = [ pygtk pillow ]; + propagatedBuildInputs = with pythonPackages; [ pygtk pillow ]; meta = { description = "Simple image viewer written in PyGTK"; |