public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
totem: Add missing python3 dependencies for plugins
This commit is contained in:
Luca Bruno 2016-04-14 22:51:37 +02:00
commit 88c0ac1f02
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3 { stdenv, fetchurl, pkgconfig, intltool, gnome3
, glib, gtk3, gobjectIntrospection, python, pygobject3 , glib, gtk3, gobjectIntrospection, python3, python3Packages, ncurses
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
configureFlags = [ "--enable-python3" ];
buildInputs = [ buildInputs = [
intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 intltool pkgconfig glib gtk3 gobjectIntrospection python3 python3Packages.pygobject3
gnome3.defaultIconTheme gnome3.defaultIconTheme ncurses
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/desktops/gnome-3/3.18/core/totem/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, gst_all_1 { stdenv, intltool, fetchurl, gst_all_1
, clutter_gtk, clutter-gst, pygobject3, shared_mime_info , clutter_gtk, clutter-gst, python3, python3Packages, shared_mime_info
, pkgconfig, gtk3, glib , pkgconfig, gtk3, glib, gobjectIntrospection
, bash, makeWrapper, itstool, libxml2, dbus_glib , bash, makeWrapper, itstool, libxml2, dbus_glib
, gnome3, librsvg, gdk_pixbuf, file }: , gnome3, librsvg, gdk_pixbuf, file }:
@ -19,13 +19,15 @@ stdenv.mkDerivation rec {
clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins 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.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 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 gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
gnome3.gsettings_desktop_schemas makeWrapper file ]; gnome3.gsettings_desktop_schemas makeWrapper file ];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/totem" \ wrapProgram "$out/bin/totem" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --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 GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --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" --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"