diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-09-26 23:18:57 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-09-26 23:18:57 +0200 |
commit | d156824f4811d9ae2fe6b9d64c1618f0461048e8 (patch) | |
tree | 0bb658e493c3d269cdb93edbb8fba8ba1c16f0ed /pkgs/applications/graphics/geeqie/default.nix | |
parent | 239760ab981afde475ac5659d25f399646c568bc (diff) | |
download | nixpkgs-d156824f4811d9ae2fe6b9d64c1618f0461048e8.tar nixpkgs-d156824f4811d9ae2fe6b9d64c1618f0461048e8.tar.gz nixpkgs-d156824f4811d9ae2fe6b9d64c1618f0461048e8.tar.bz2 nixpkgs-d156824f4811d9ae2fe6b9d64c1618f0461048e8.tar.lz nixpkgs-d156824f4811d9ae2fe6b9d64c1618f0461048e8.tar.xz nixpkgs-d156824f4811d9ae2fe6b9d64c1618f0461048e8.tar.zst nixpkgs-d156824f4811d9ae2fe6b9d64c1618f0461048e8.zip |
geeqie: update from 1.1 to 1.2 and adopt it
Diffstat (limited to 'pkgs/applications/graphics/geeqie/default.nix')
-rw-r--r-- | pkgs/applications/graphics/geeqie/default.nix | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index de906e3d844..6636d5fc9ec 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,26 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms -, intltool, gettext, libchamplain_0_6, fbida }: +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2, lcms +, intltool, gettext, libchamplain, fbida }: stdenv.mkDerivation rec { - name = "geeqie-1.1"; + name = "geeqie-${version}"; + version = "1.2"; src = fetchurl { - url = "mirror://sourceforge/geeqie/${name}.tar.gz"; - sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m"; + url = "https://gitorious.org/geeqie/geeqie/archive/v${version}.tar.gz"; + sha256 = "13sgf20h0z8dz1075vmyh8vbxgchq30cqrl15zfv9h8hp271vpfj"; }; - preConfigure = - # 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' - ''; + preConfigure = "./autogen.sh"; configureFlags = [ "--enable-gps" ]; buildInputs = - [ pkgconfig gtk libpng exiv2 lcms intltool gettext - libchamplain_0_6 + [ pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext + libchamplain ]; postInstall = @@ -31,7 +27,7 @@ stdenv.mkDerivation rec { -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' ''; - meta = { + meta = with stdenv.lib; { description = "Lightweight GTK+ based image viewer"; longDescription = @@ -45,11 +41,11 @@ stdenv.mkDerivation rec { initially based on GQview. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; homepage = http://geeqie.sourceforge.net; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.gnu; }; } |