From 3ba16c8234fdb5a49dde2501d3425eff0e5624a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 26 Sep 2016 11:09:25 +0200 Subject: Do not use top-level buildPythonPackage or buildPythonApplication but instead use the one in pythonPackages. --- pkgs/applications/graphics/mcomix/default.nix | 5 ++--- pkgs/applications/graphics/mirage/default.nix | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/graphics') 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"; -- cgit 1.4.1