diff options
author | Johannes Frankenau <johannes@frankenau.net> | 2018-02-24 11:49:39 +0100 |
---|---|---|
committer | Johannes Frankenau <johannes@frankenau.net> | 2018-02-24 11:51:21 +0100 |
commit | a3f856b85dba488816875a58c0a1dc47e86b0c50 (patch) | |
tree | 48dd6391584c09b40aa54e57c279d7472fac5417 /pkgs/applications/graphics/geeqie/default.nix | |
parent | cece81ff58aa7937f45e4ee3443b4a288ae9fcd7 (diff) | |
download | nixlib-a3f856b85dba488816875a58c0a1dc47e86b0c50.tar nixlib-a3f856b85dba488816875a58c0a1dc47e86b0c50.tar.gz nixlib-a3f856b85dba488816875a58c0a1dc47e86b0c50.tar.bz2 nixlib-a3f856b85dba488816875a58c0a1dc47e86b0c50.tar.lz nixlib-a3f856b85dba488816875a58c0a1dc47e86b0c50.tar.xz nixlib-a3f856b85dba488816875a58c0a1dc47e86b0c50.tar.zst nixlib-a3f856b85dba488816875a58c0a1dc47e86b0c50.zip |
geeqie: 1.3 -> 1.4
Diffstat (limited to 'pkgs/applications/graphics/geeqie/default.nix')
-rw-r--r-- | pkgs/applications/graphics/geeqie/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 1e8f0e209c06..8815ed418030 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 -, lcms, intltool, gettext, fbida +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +, gtk3, lcms2, exiv2, libchamplain, clutter_gtk, ffmpegthumbnailer, fbida }: stdenv.mkDerivation rec { name = "geeqie-${version}"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "http://geeqie.org/${name}.tar.xz"; - sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb"; + sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; - preConfigure = "./autogen.sh"; + # Do not build the changelog as this requires markdown. + patches = [ ./geeqie-no-changelog.patch ]; - configureFlags = [ "--enable-gps" ]; + preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; buildInputs = [ - autoconf automake gtk2 libpng exiv2 lcms intltool gettext + gtk3 lcms2 exiv2 libchamplain clutter_gtk ffmpegthumbnailer fbida ]; postInstall = '' @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Lightweight GTK+ based image viewer"; @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ jfrankenau pSub ]; platforms = platforms.gnu; }; } |