tracker, gnome-music: drop LD_LIBRARY_PATH

This commit is contained in:
Luca Bruno 2014-12-08 20:27:08 +01:00
parent aff0cd143b
commit 5a999ca446
2 changed files with 11 additions and 14 deletions

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
gdk_pixbuf gnome3.gnome_icon_theme librsvg python3
gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo
gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
gst_all_1.gstreamer gst_all_1.gst-plugins-base
@ -24,19 +24,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preFixup =
let
libPath = stdenv.lib.makeLibraryPath
[ glib gtk3 libnotify tracker gnome3.grilo cairo
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.totem-pl-parser
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ];
in
''
preFixup = ''
wrapProgram "$out/bin/gnome-music" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "${libPath}" \
--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 PYTHONPATH : "$PYTHONPATH"

View File

@ -1,8 +1,8 @@
{ stdenv, intltool, fetchurl, libxml2, upower
, pkgconfig, gtk3, glib, hicolor_icon_theme
, bash, makeWrapper, itstool, vala, sqlite
, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection
, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf
, gnome3, librsvg, gdk_pixbuf, file, libnotify
, evolution_data_server, gst_all_1, poppler
, evolution_data_server, gst_all_1, poppler, libtool
, icu, taglib, libjpeg, libtiff, giflib, libcue
, libvorbis, flac, exempi, networkmanager
, libpng, libexif, libgsf, libuuid, bzip2 }:
@ -21,8 +21,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preConfigure = ''
substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/"
'';
buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
bzip2 gnome3.totem-pl-parser
bzip2 gnome3.totem-pl-parser gobjectIntrospection
automake114x autoconf libtool
gnome3.gsettings_desktop_schemas makeWrapper file
gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
upower libnotify evolution_data_server gnome3.libgee