Remove pycairo from top-level

See #11567.

4 files changed, 29 insertions, 29 deletions

diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 79393eee7f11e..d750aea01ef0c 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool,
+{ stdenv, fetchurl, gtk3, pythonPackages, intltool,
   pango, gsettings_desktop_schemas }:
 
-pythonPackages.buildPythonApplication rec {
+let
+  inherit (pythonPackages) python buildPythonApplication;
+in buildPythonApplication rec {
   version = "4.1.1";
   name = "gramps-${version}";
-  namePrefix = "";
 
   buildInputs = [ intltool gtk3 ];
 
@@ -16,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060";
   };
 
-  pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ];
+  pythonPath = with pythonPackages; [ pygobject3 pycairo bsddb ] ++ [ pango ];
 
   # Same installPhase as in buildPythonApplication but without --old-and-unmanageble
   # install flag.
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix
index bad10a8607a60..f6df5fc496d79 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/applications/search/catfish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils, pycairo,
+{ stdenv, fetchurl, file, which, intltool, findutils, xdg_utils,
   gnome3, pythonPackages, wrapGAppsHook }:
 
 pythonPackages.buildPythonApplication rec {
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 99e45438984d0..503ae4e90b9cd 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook
-, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file
+{ stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook
+, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file
 }:
 
 
 let
   minor = "3.16";
   version = "${minor}.2";
-in
-
-buildPythonApplication rec {
+  inherit (pythonPackages) python buildPythonApplication pycairo pygobject3;
+in buildPythonApplication rec {
   name = "meld-${version}";
-  namePrefix = "";
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
@@ -18,19 +16,19 @@ buildPythonApplication rec {
   };
 
   buildInputs = [
-    python27 intltool wrapGAppsHook itstool libxml2
+    intltool wrapGAppsHook itstool libxml2
     gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
     gnome3.defaultIconTheme gnome3.dconf file
   ];
   propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
 
   installPhase = ''
-    mkdir -p "$out/lib/${python27.libPrefix}/site-packages"
+    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
 
-    export PYTHONPATH="$out/lib/${python27.libPrefix}/site-packages:$PYTHONPATH"
+    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
 
-    ${python27}/bin/${python27.executable} setup.py install \
-      --install-lib=$out/lib/${python27.libPrefix}/site-packages \
+    ${python}/bin/${python.executable} setup.py install \
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
       --prefix="$out"
 
     mkdir -p $out/share/gsettings-schemas/$name
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 07d60fe4764bc..266f3978b9921 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, buildPythonApplication, pythonPackages, pkgconfig
-, pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk
-, taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk
+{ stdenv, fetchurl, pkgconfig
+, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
+, taglib, sqlite
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
 , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
 , enableBonjour ? false, avahi ? null
@@ -10,10 +10,11 @@ assert enableBonjour -> avahi != null;
 
 with stdenv.lib;
 
-buildPythonApplication rec {
-  name = "miro-${version}";
-  namePrefix = "";
+let
+  inherit (pythonPackages) python buildPythonApplication;
   version = "6.0";
+in buildPythonApplication rec {
+  name = "miro-${version}";
 
   src = fetchurl {
     url = "http://ftp.osuosl.org/pub/pculture.org/miro/src/${name}.tar.gz";
@@ -56,7 +57,7 @@ buildPythonApplication rec {
 
   preInstall = ''
     # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
-    ${python}/bin/${python.executable} setup.py install_data --root=$out
+    ${python.interpreter} setup.py install_data --root=$out
     sed -i '/data_files=data_files/d' setup.py
   '';
 
@@ -68,14 +69,14 @@ buildPythonApplication rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
-  buildInputs = [
-    pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup
-    pygtk taglib gsettings_desktop_schemas sqlite
+  buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [
+    pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup
+    taglib gsettings_desktop_schemas sqlite
   ];
 
-  propagatedBuildInputs = [
-    pygobject pygtk pycurl python.modules.sqlite3 mutagen pycairo pythonDBus
-    pywebkitgtk libtorrentRasterbar
+  propagatedBuildInputs = with pythonPackages; [
+    pygobject pygtk pycurl sqlite3 mutagen pycairo dbus
+    pywebkitgtk] ++ [ libtorrentRasterbar
     gst_python gst_plugins_base gst_plugins_good gst_ffmpeg
   ] ++ optional enableBonjour avahi;