diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-12-08 20:27:08 +0100 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-12-08 20:27:22 +0100 |
| commit | 5a999ca446da990fa1ee7788ed4e221cc71269ad (patch) | |
| tree | 85f61d254842928f1c7f2a60c23439ad5b6b52e4 /pkgs/desktops | |
| parent | aff0cd143ba40b1ef7c622f3d4f8cd21bf9f3a66 (diff) | |
| download | nixlib-5a999ca446da990fa1ee7788ed4e221cc71269ad.tar nixlib-5a999ca446da990fa1ee7788ed4e221cc71269ad.tar.gz nixlib-5a999ca446da990fa1ee7788ed4e221cc71269ad.tar.bz2 nixlib-5a999ca446da990fa1ee7788ed4e221cc71269ad.tar.lz nixlib-5a999ca446da990fa1ee7788ed4e221cc71269ad.tar.xz nixlib-5a999ca446da990fa1ee7788ed4e221cc71269ad.tar.zst nixlib-5a999ca446da990fa1ee7788ed4e221cc71269ad.zip | |
tracker, gnome-music: drop LD_LIBRARY_PATH
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix index c5f9bdb27746..028ab4832eff 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix @@ -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" diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index cf84f511416b..0d5cc4d14279 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -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 |