diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-07-02 14:07:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 14:07:45 +0200 |
| commit | 158013244a989e85b68e176591fcafbd087da602 (patch) | |
| tree | 3f9a3de4ee5c8f9871382f29e9a1a4bab85759c0 | |
| parent | 648ae736f00c7ba8169a490594263d719dfa402b (diff) | |
| parent | 6904030b4256bc4eb3f571161b6ef73a28ec2e36 (diff) | |
| download | nixlib-158013244a989e85b68e176591fcafbd087da602.tar nixlib-158013244a989e85b68e176591fcafbd087da602.tar.gz nixlib-158013244a989e85b68e176591fcafbd087da602.tar.bz2 nixlib-158013244a989e85b68e176591fcafbd087da602.tar.lz nixlib-158013244a989e85b68e176591fcafbd087da602.tar.xz nixlib-158013244a989e85b68e176591fcafbd087da602.tar.zst nixlib-158013244a989e85b68e176591fcafbd087da602.zip | |
Merge pull request #16581 from vrthra/vp
vp: init at 1.8
| -rw-r--r-- | pkgs/applications/misc/vp/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix new file mode 100644 index 000000000000..c40df820b33d --- /dev/null +++ b/pkgs/applications/misc/vp/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2765217b6f30..6737b67a00e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |