From 4f6b6f14726296c1d402f187db995031bccd791f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 31 Aug 2016 11:01:16 +0200 Subject: pythonPackages: use mkPythonDerivation --- pkgs/development/python-modules/dbus/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'pkgs/development/python-modules/dbus') diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index e99a10ab1c406..f3f897ac9e790 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy , ncurses, pygobject3 }: -if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { +if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else mkPythonDerivation rec { name = "dbus-python-1.2.4"; src = fetchurl { @@ -11,21 +11,17 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; - buildInputs = [ python pkgconfig dbus dbus_glib ] - ++ stdenv.lib.optionals doCheck [ dbus_tools pygobject3 ] + buildInputs = [ pkgconfig dbus dbus_glib ] + ++ lib.optionals doCheck [ dbus_tools pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. - ++ stdenv.lib.optional (! python ? modules) ncurses; + ++ lib.optional (! python ? modules) ncurses; doCheck = true; - # Set empty pythonPath, so that the package is recognized as a python package - # for python.buildEnv - pythonPath = []; - meta = { description = "Python DBus bindings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = dbus.meta.platforms; }; } -- cgit 1.4.1