shotwell: 0.27.1 → 0.27.2

Clean up, upgrade, switch to recent vala and port to meson.

1 files changed, 19 insertions, 20 deletions

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index b0a6f7caf88..b23ddbf9d78 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,38 +1,37 @@
-{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite
-, webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib
-, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook
-, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }:
+{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
+, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib
+, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook
+, itstool, libgdata }:
 
-# for dependencies see http://www.yorba.org/projects/shotwell/install/
+# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
 
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
   major = "0.27";
-  minor = "1";
+  minor = "2";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
+    sha256 = "0bxc15gk2306fvxg6bg1s6c706yd89i66ldng0z102mcfi98warb";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
+  nativeBuildInputs = [
+    meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook
+  ];
 
-  configureFlags = [ "--disable-gsettings-convert-install" ];
+  buildInputs = [
+    gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
+    libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas
+    libraw json_glib glib gdk_pixbuf librsvg gnome3.rest
+    gnome3.gcr gnome3.defaultIconTheme libgdata
+  ];
 
-  preConfigure = ''
-    patchShebangs .
+  postInstall = ''
+    glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
-  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
-                  which udev libgudev gnome3.gexiv2 hicolor_icon_theme
-                  libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
-                  gnome_doc_utils gnome3.rest gnome3.gcr
-                  gnome3.defaultIconTheme itstool libgdata ];
-
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";
     homepage = https://wiki.gnome.org/Apps/Shotwell;