lol

Merge pull request #14739 from rycee/bump/gnome3-tracker

gnome3.tracker: 1.4.0 -> 1.8.0

+13 -18
+13 -18
pkgs/desktops/gnome-3/3.18/core/tracker/default.nix
··· 1 1 { stdenv, intltool, fetchurl, libxml2, upower 2 - , pkgconfig, gtk3, glib 3 - , bash, makeWrapper, itstool, vala, sqlite, libxslt 2 + , pkgconfig, gtk3, glib, dconf 3 + , bash, wrapGAppsHook, itstool, vala, sqlite, libxslt 4 4 , gnome3, librsvg, gdk_pixbuf, file, libnotify 5 5 , evolution_data_server, gst_all_1, poppler 6 6 , icu, taglib, libjpeg, libtiff, giflib, libcue ··· 8 8 , libpng, libexif, libgsf, libuuid, bzip2 }: 9 9 10 10 let 11 - majorVersion = "1.4"; 11 + majorVersion = "1.8"; 12 12 in 13 13 stdenv.mkDerivation rec { 14 14 name = "tracker-${majorVersion}.0"; 15 15 16 16 src = fetchurl { 17 17 url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz"; 18 - sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68"; 18 + sha256 = "0zchaahk4w7dwanqk1vx0qgnyrlzlp81krwawfx3mv5zffik27x1"; 19 19 }; 20 20 21 21 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 22 22 23 - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler"; 24 - 25 - enableParallelBuilding = true; 23 + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 26 24 27 - buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 25 + buildInputs = [ vala gtk3 glib dconf intltool itstool libxml2 28 26 bzip2 gnome3.totem-pl-parser libxslt 29 - gnome3.gsettings_desktop_schemas makeWrapper file 27 + gnome3.gsettings_desktop_schemas wrapGAppsHook file 30 28 gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite 31 29 upower libnotify evolution_data_server gnome3.libgee 32 30 gst_all_1.gstreamer gst_all_1.gst-plugins-base flac 33 31 poppler icu taglib libjpeg libtiff giflib libvorbis 34 32 exempi networkmanager libpng libexif libgsf libuuid ]; 35 33 34 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; 35 + 36 + enableParallelBuilding = true; 37 + 36 38 preConfigure = '' 37 - substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" 38 - ''; 39 - 40 - preFixup = '' 41 - for f in $out/bin/* $out/libexec/*; do 42 - wrapProgram $f \ 43 - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ 44 - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 45 - done 39 + substituteInPlace src/libtracker-sparql/Makefile.in \ 40 + --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" 46 41 ''; 47 42 48 43 meta = with stdenv.lib; {