about summary refs log tree commit diff
path: root/pkgs/development/python-modules/pygobject
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2016-08-31 11:01:16 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2016-09-01 16:16:31 +0200
commit4f6b6f14726296c1d402f187db995031bccd791f (patch)
tree56b714c2eb6d16e4bfd98f9c64c84fbfbac3c031 /pkgs/development/python-modules/pygobject
parente9c4d00cacea699c0e23e7c09967dd3fe12edc23 (diff)
pythonPackages: use mkPythonDerivation
Diffstat (limited to 'pkgs/development/python-modules/pygobject')
-rw-r--r--pkgs/development/python-modules/pygobject/3.nix10
-rw-r--r--pkgs/development/python-modules/pygobject/default.nix8
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index a6a4d367f1f38..43882476b9d5e 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
+{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
 
-stdenv.mkDerivation rec {
+mkPythonDerivation rec {
   major = "3.20";
   minor = "0";
   name = "pygobject-${major}.${minor}";
@@ -10,14 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari";
   };
 
-  buildInputs = [ python pkgconfig glib gobjectIntrospection ];
+  buildInputs = [ pkgconfig glib gobjectIntrospection ];
   propagatedBuildInputs = [ pycairo cairo ];
 
-  passthru.pythonPath = [];
-
   meta = {
     homepage = http://live.gnome.org/PyGObject;
     description = "Python bindings for Glib";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 3faba55d6a80d..5c9367a1f460f 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, pkgconfig, glib }:
+{ stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }:
 
-stdenv.mkDerivation rec {
+mkPythonDerivation rec {
   name = "pygobject-2.28.6";
   
   src = fetchurl {
@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-introspection";
 
-  buildInputs = [ python pkgconfig glib ];
-
-  passthru.pythonPath = [];
+  buildInputs = [ pkgconfig glib ];
 
   # in a "normal" setup, pygobject and pygtk are installed into the
   # same site-packages: we need a pth file for both. pygtk.py would be