diff options
| author | Nicolas Petton <nicolas@petton.fr> | 2016-04-14 22:18:56 +0200 |
|---|---|---|
| committer | Nicolas Petton <nicolas@petton.fr> | 2016-04-14 22:18:56 +0200 |
| commit | cf7d79de2cf2cf6dd3c5c445737c5314698c10aa (patch) | |
| tree | 989368de26397a297d5fa1538860acc8b32fc1d1 /pkgs/desktops | |
| parent | 358900674b9ecf85ef4add5fa36aa0eb94f76c36 (diff) | |
| download | nixlib-cf7d79de2cf2cf6dd3c5c445737c5314698c10aa.tar nixlib-cf7d79de2cf2cf6dd3c5c445737c5314698c10aa.tar.gz nixlib-cf7d79de2cf2cf6dd3c5c445737c5314698c10aa.tar.bz2 nixlib-cf7d79de2cf2cf6dd3c5c445737c5314698c10aa.tar.lz nixlib-cf7d79de2cf2cf6dd3c5c445737c5314698c10aa.tar.xz nixlib-cf7d79de2cf2cf6dd3c5c445737c5314698c10aa.tar.zst nixlib-cf7d79de2cf2cf6dd3c5c445737c5314698c10aa.zip | |
totem: Add missing python3 dependencies for plugins
libpeas: build with python3 support
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/totem/default.nix | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix index 8d40d977a80b..a0b0523524c6 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobjectIntrospection, python, pygobject3 +, glib, gtk3, gobjectIntrospection, python3, python3Packages, ncurses }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + configureFlags = [ "--enable-python3" ]; + buildInputs = [ - intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 - gnome3.defaultIconTheme + intltool pkgconfig glib gtk3 gobjectIntrospection python3 python3Packages.pygobject3 + gnome3.defaultIconTheme ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix index bcf30baa5bae..cc35ede88f3a 100644 --- a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib +, clutter_gtk, clutter-gst, python3, python3Packages, shared_mime_info +, pkgconfig, gtk3, glib, gobjectIntrospection , bash, makeWrapper, itstool, libxml2, dbus_glib , gnome3, librsvg, gdk_pixbuf, file }: @@ -19,13 +19,15 @@ stdenv.mkDerivation rec { clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - gnome3.libpeas pygobject3 shared_mime_info dbus_glib + gnome3.libpeas python3Packages.pygobject3 gobjectIntrospection shared_mime_info dbus_glib gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.gsettings_desktop_schemas makeWrapper file ]; preFixup = '' wrapProgram "$out/bin/totem" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix PYTHONPATH : "${python3Packages.pygobject3}/lib/python3.4/site-packages:$PYTHONPATH" \ + --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:$GI_TYPELIB_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" |