Merge pull request #14702 from NicolasPetton/totem-libpeas-plugins

totem: Add missing python3 dependencies for plugins

+10 -6
+5 -3
pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix
··· 1 { stdenv, fetchurl, pkgconfig, intltool, gnome3 2 - , glib, gtk3, gobjectIntrospection, python, pygobject3 3 }: 4 5 stdenv.mkDerivation rec { 6 inherit (import ./src.nix fetchurl) name src; 7 8 buildInputs = [ 9 - intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 10 - gnome3.defaultIconTheme 11 ]; 12 13 meta = with stdenv.lib; {
··· 1 { stdenv, fetchurl, pkgconfig, intltool, gnome3 2 + , glib, gtk3, gobjectIntrospection, python3, python3Packages, ncurses 3 }: 4 5 stdenv.mkDerivation rec { 6 inherit (import ./src.nix fetchurl) name src; 7 + 8 + configureFlags = [ "--enable-python3" ]; 9 10 buildInputs = [ 11 + intltool pkgconfig glib gtk3 gobjectIntrospection python3 python3Packages.pygobject3 12 + gnome3.defaultIconTheme ncurses 13 ]; 14 15 meta = with stdenv.lib; {
+5 -3
pkgs/desktops/gnome-3/3.18/core/totem/default.nix
··· 1 { stdenv, intltool, fetchurl, gst_all_1 2 - , clutter_gtk, clutter-gst, pygobject3, shared_mime_info 3 - , pkgconfig, gtk3, glib 4 , bash, makeWrapper, itstool, libxml2, dbus_glib 5 , gnome3, librsvg, gdk_pixbuf, file }: 6 ··· 19 clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins 20 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good 21 gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav 22 - gnome3.libpeas pygobject3 shared_mime_info dbus_glib 23 gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop 24 gnome3.gsettings_desktop_schemas makeWrapper file ]; 25 26 preFixup = '' 27 wrapProgram "$out/bin/totem" \ 28 --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ 29 --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ 30 --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ 31 --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
··· 1 { stdenv, intltool, fetchurl, gst_all_1 2 + , clutter_gtk, clutter-gst, python3, python3Packages, shared_mime_info 3 + , pkgconfig, gtk3, glib, gobjectIntrospection 4 , bash, makeWrapper, itstool, libxml2, dbus_glib 5 , gnome3, librsvg, gdk_pixbuf, file }: 6 ··· 19 clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins 20 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good 21 gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav 22 + gnome3.libpeas python3Packages.pygobject3 gobjectIntrospection shared_mime_info dbus_glib 23 gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop 24 gnome3.gsettings_desktop_schemas makeWrapper file ]; 25 26 preFixup = '' 27 wrapProgram "$out/bin/totem" \ 28 --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ 29 + --prefix PYTHONPATH : "${python3Packages.pygobject3}/lib/python3.4/site-packages:$PYTHONPATH" \ 30 + --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:$GI_TYPELIB_PATH" \ 31 --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ 32 --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ 33 --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"