diff options
| author | Miguel Madrid <mimadrid@ucm.es> | 2016-08-19 13:33:06 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2016-08-19 13:33:06 +0200 |
| commit | 1b69ef935e9813ae027d26d3595555284e98f6b4 (patch) | |
| tree | 14ebc4929649456f297e8c4235393f5069031669 /pkgs/applications/graphics/shotwell | |
| parent | 20c0fe49004d1c1da7ad15d4161584fc236affee (diff) | |
| download | nixlib-1b69ef935e9813ae027d26d3595555284e98f6b4.tar nixlib-1b69ef935e9813ae027d26d3595555284e98f6b4.tar.gz nixlib-1b69ef935e9813ae027d26d3595555284e98f6b4.tar.bz2 nixlib-1b69ef935e9813ae027d26d3595555284e98f6b4.tar.lz nixlib-1b69ef935e9813ae027d26d3595555284e98f6b4.tar.xz nixlib-1b69ef935e9813ae027d26d3595555284e98f6b4.tar.zst nixlib-1b69ef935e9813ae027d26d3595555284e98f6b4.zip | |
shotwell: 0.23.4 -> 0.23.5 (#17827)
Diffstat (limited to 'pkgs/applications/graphics/shotwell')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 21c05ee66f5e..445cc6aadf55 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite , webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib -, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, makeWrapper +, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook , gnome_doc_utils, hicolor_icon_theme, itstool }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; major = "0.23"; - minor = "4"; + minor = "5"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "1hnl0lxibklmr1cy95ij1b3jgvdsw4zlcja53ngfxvlsi2r2bbxi"; + sha256 = "0fgs1rgvkmy79bmpxrsvm5w8rvqml4l1vnwma0xqx5zzm02p8a07"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; @@ -24,19 +24,11 @@ stdenv.mkDerivation rec { patchShebangs . ''; - preFixup = '' - wrapProgram "$out/bin/shotwell" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - ''; - - buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk pkgconfig 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 - makeWrapper gnome_doc_utils gnome3.rest + wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.defaultIconTheme itstool ]; meta = with stdenv.lib; { |