public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shotwell: use gnome3.rest to fix build

Browse Source
This commit is contained in:
Luca Bruno
2015-07-30 13:01:03 +02:00
parent 7f65b99998
commit 8dbc328ad6
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/shotwell/default.nix
+10 -21
View File
@@ -1,23 +1,11 @@
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils , webkitgtk24x, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib
, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }: , 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/ # for dependencies see http://www.yorba.org/projects/shotwell/install/
let stdenv.mkDerivation rec {
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 {
version = "0.20.2"; version = "0.20.2";
name = "shotwell-${version}"; name = "shotwell-${version}";
@@ -47,10 +35,11 @@ in stdenv.mkDerivation rec {
''; '';
buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg which udev gnome3.gexiv2 hicolor_icon_theme
makeWrapper gnome_doc_utils libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
makeWrapper gnome_doc_utils gnome3.rest
gnome3.defaultIconTheme ]; gnome3.defaultIconTheme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {