diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:59:07 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:59:07 +0100 |
commit | cbd2305d4dad93142e4fa17ca7935c6d215d981f (patch) | |
tree | faf2ca2dda19a66aec3a9c7d39d5a3f49e58b1d0 /pkgs/applications/graphics/shotwell | |
parent | d2688fd6955ae3d215a684bd86777515fc644349 (diff) | |
parent | f9c96df1d5d8cf6db264c41cb2de227636381203 (diff) | |
download | nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.gz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.bz2 nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.lz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.xz nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.tar.zst nixlib-cbd2305d4dad93142e4fa17ca7935c6d215d981f.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/graphics/shotwell')
-rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 1953f951d169..48044fba1666 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit +{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils , lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: @@ -18,12 +18,12 @@ let buildInputs = [ pkgconfig glib libsoup ]; }; in stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.20.2"; name = "shotwell-${version}"; src = fetchurl { - url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz"; - sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7"; + url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz"; + sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip"; }; NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ''; - buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig + buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg makeWrapper gnome_doc_utils ]; |