geeqie: update from 1.1 to 1.2 and adopt it

This commit is contained in:
Pascal Wittmann 2014-09-26 23:18:57 +02:00
parent 239760ab98
commit d156824f48

View File

@ -1,26 +1,22 @@
{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms { stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2, lcms
, intltool, gettext, libchamplain_0_6, fbida }: , intltool, gettext, libchamplain, fbida }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geeqie-1.1"; name = "geeqie-${version}";
version = "1.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/geeqie/${name}.tar.gz"; url = "https://gitorious.org/geeqie/geeqie/archive/v${version}.tar.gz";
sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m"; sha256 = "13sgf20h0z8dz1075vmyh8vbxgchq30cqrl15zfv9h8hp271vpfj";
}; };
preConfigure = preConfigure = "./autogen.sh";
# XXX: Trick to have Geeqie use the version we have.
'' sed -i "configure" \
-e 's/champlain-0.4/champlain-0.6/g ;
s/champlain-gtk-0.4/champlain-gtk-0.6/g'
'';
configureFlags = [ "--enable-gps" ]; configureFlags = [ "--enable-gps" ];
buildInputs = buildInputs =
[ pkgconfig gtk libpng exiv2 lcms intltool gettext [ pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext
libchamplain_0_6 libchamplain
]; ];
postInstall = postInstall =
@ -31,7 +27,7 @@ stdenv.mkDerivation rec {
-e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH'
''; '';
meta = { meta = with stdenv.lib; {
description = "Lightweight GTK+ based image viewer"; description = "Lightweight GTK+ based image viewer";
longDescription = longDescription =
@ -45,11 +41,11 @@ stdenv.mkDerivation rec {
initially based on GQview. initially based on GQview.
''; '';
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
homepage = http://geeqie.sourceforge.net; homepage = http://geeqie.sourceforge.net;
maintainers = [ ]; maintainers = with maintainers; [ pSub ];
platforms = stdenv.lib.platforms.gnu; platforms = platforms.gnu;
}; };
} }