Merge pull request #16602 from vrthra/zgv

zgv: init at 5.9

Changed files
+60
pkgs
applications
graphics
top-level
+39
pkgs/applications/graphics/zgv/default.nix
···
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, SDL, SDL_image, libjpeg, libpng, libtiff }:
+
+
stdenv.mkDerivation rec {
+
name = "zgv-${version}";
+
version = "5.9";
+
src = fetchurl {
+
url = "http://www.svgalib.org/rus/zgv/${name}.tar.gz";
+
sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
+
};
+
+
buildInputs = [ SDL SDL_image pkgconfig libjpeg libpng libtiff ];
+
+
makeFlags = [
+
"BACKEND=SDL"
+
];
+
+
patches = [
+
(fetchpatch {
+
url = https://foss.aueb.gr/mirrors/linux/gentoo/media-gfx/zgv/files/zgv-5.9-libpng15.patch;
+
sha256 = "1blw9n04c28bnwcmcn64si4f5zpg42s8yn345js88fyzi9zm19xw";
+
})
+
./switch.patch
+
];
+
+
patchFlags = "-p0";
+
+
installPhase = ''
+
mkdir -p $out/bin
+
cp src/zgv $out/bin
+
'';
+
+
meta = with stdenv.lib; {
+
homepage = http://www.svgalib.org/rus/zgv/;
+
description = "Picture viewer with a thumbnail-based selector";
+
license = licenses.gpl2;
+
maintainers = [ maintainers.vrthra ];
+
platforms = platforms.linux;
+
};
+
}
+14
pkgs/applications/graphics/zgv/switch.patch
···
+
GCC complains
+
+
diff -ur src/zgv_io.c src/zgv_io.c
+
--- src/zgv_io.c 2005-01-20 15:07:46.000000000 -0800
+
+++ src/zgv_io.c 2016-06-29 10:19:40.169897611 -0700
+
@@ -645,7 +645,7 @@
+
case SDLK_INSERT: return(RK_INSERT);
+
case SDLK_DELETE: return(RK_DELETE);
+
case SDLK_RETURN: return(RK_ENTER);
+
- default:
+
+ default: ;
+
/* stop complaints */
+
}
+
+7
pkgs/top-level/all-packages.nix
···
zgrviewer = callPackage ../applications/graphics/zgrviewer {};
+
zgv = callPackage ../applications/graphics/zgv {
+
# Enable the below line for terminal display. Note
+
# that it requires sixel graphics compatible terminals like mlterm
+
# or xterm -ti 340
+
SDL = SDL_sixel;
+
};
+
zim = callPackage ../applications/office/zim {
pygtk = pyGtkGlade;