diff options
| author | Miguel Madrid <mimadrid@ucm.es> | 2016-07-23 00:32:23 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2016-07-23 00:32:23 +0200 |
| commit | 8816df20f30b33fd0eb9221b58e488201c909805 (patch) | |
| tree | ea0b23659b863b713f6e18f75163900bf076def2 /pkgs/applications/graphics/shotwell | |
| parent | 9886c80daa8c5601f3a6de2a1512d00435da3432 (diff) | |
| download | nixpkgs-8816df20f30b33fd0eb9221b58e488201c909805.tar nixpkgs-8816df20f30b33fd0eb9221b58e488201c909805.tar.gz nixpkgs-8816df20f30b33fd0eb9221b58e488201c909805.tar.bz2 nixpkgs-8816df20f30b33fd0eb9221b58e488201c909805.tar.lz nixpkgs-8816df20f30b33fd0eb9221b58e488201c909805.tar.xz nixpkgs-8816df20f30b33fd0eb9221b58e488201c909805.tar.zst nixpkgs-8816df20f30b33fd0eb9221b58e488201c909805.zip | |
shotwell: 0.23.2 -> 0.23.4 (#17190)
Diffstat (limited to 'pkgs/applications/graphics/shotwell')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index e52eb045ffb..21c05ee66f5 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,19 +1,19 @@ { 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 -, gnome_doc_utils, hicolor_icon_theme }: +, gnome_doc_utils, hicolor_icon_theme, itstool }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ stdenv.mkDerivation rec { version = "${major}.${minor}"; major = "0.23"; - minor = "2"; + minor = "4"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "d52caae4e3204f2f78e2eb828d955848ea6fef5c91d3ac6e9eb0b185c0490b39"; + sha256 = "1hnl0lxibklmr1cy95ij1b3jgvdsw4zlcja53ngfxvlsi2r2bbxi"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; @@ -24,11 +24,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ - ''; - preFixup = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ @@ -42,7 +37,7 @@ stdenv.mkDerivation rec { 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 - gnome3.defaultIconTheme ]; + gnome3.defaultIconTheme itstool ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; |