diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-07-30 13:00:37 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-07-30 13:01:03 +0200 |
| commit | 8dbc328ad66089d51736ad55aeb3edb4377fa948 (patch) | |
| tree | c3ce0da84b613e67cf57929b48befcf307f3273f /pkgs/applications/graphics/shotwell | |
| parent | 7f65b99998d6b5ae0e001048c216c444706d8a16 (diff) | |
| download | nixpkgs-8dbc328ad66089d51736ad55aeb3edb4377fa948.tar nixpkgs-8dbc328ad66089d51736ad55aeb3edb4377fa948.tar.gz nixpkgs-8dbc328ad66089d51736ad55aeb3edb4377fa948.tar.bz2 nixpkgs-8dbc328ad66089d51736ad55aeb3edb4377fa948.tar.lz nixpkgs-8dbc328ad66089d51736ad55aeb3edb4377fa948.tar.xz nixpkgs-8dbc328ad66089d51736ad55aeb3edb4377fa948.tar.zst nixpkgs-8dbc328ad66089d51736ad55aeb3edb4377fa948.zip | |
shotwell: use gnome3.rest to fix build
Diffstat (limited to 'pkgs/applications/graphics/shotwell')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 94131cbf4ff..2b25f8d41f6 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,23 +1,11 @@ -{ 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, hicolor_icon_theme, cacert }: +{ 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, hicolor_icon_theme, cacert }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ -let - rest = stdenv.mkDerivation rec { - name = "rest-0.7.12"; - - src = fetchurl { - url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn"; - }; - - configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; - - buildInputs = [ pkgconfig glib libsoup ]; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "0.20.2"; name = "shotwell-${version}"; @@ -47,10 +35,11 @@ in stdenv.mkDerivation rec { ''; - 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 + 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 hicolor_icon_theme + libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg + makeWrapper gnome_doc_utils gnome3.rest gnome3.defaultIconTheme ]; meta = with stdenv.lib; { |