Merge pull request #16581 from vrthra/vp

vp: init at 1.8
This commit is contained in:
Joachim Fasting 2016-07-02 14:07:45 +02:00 committed by GitHub
commit 158013244a
2 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, autoconf, automake, SDL, SDL_image }:
stdenv.mkDerivation rec {
name = "vp-${version}";
version = "1.8";
src = fetchFromGitHub {
owner = "erikg";
repo = "vp";
rev = "v${version}";
sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq";
};
buildInputs = [ SDL autoconf automake SDL_image ];
preConfigure = ''
autoreconf -i
'';
meta = with stdenv.lib; {
homepage = http://brlcad.org/~erik/;
description = "SDL based picture viewer/slideshow";
platforms = platforms.unix;
license = licenses.gpl3;
maintainers = [ maintainers.vrthra ];
};
}

View File

@ -3757,6 +3757,13 @@ in
vpnc = callPackage ../tools/networking/vpnc { };
vp = callPackage ../applications/misc/vp {
# Enable next line for console graphics. Note that
# it requires `sixel` enabled terminals such as mlterm
# or xterm -ti 340
SDL = SDL_sixel;
};
openconnect = openconnect_openssl;
openconnect_openssl = callPackage ../tools/networking/openconnect.nix {