vp: 1.8 -> 1.8-unstable-2017-03-22

- finalAttrs
- strictDeps
- split outputs
- fix NIX_CFLAGS_COMPILE
- add maintainer AndersonTorres

pkgs/by-name/vp/vp/package.nix

@@ -1,28 +1,48 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, SDL, SDL_image }:
+{
+  lib,
+  SDL,
+  SDL_image,
+  autoreconfHook,
+  fetchFromGitHub,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vp";
-  version = "1.8";
+  version = "1.8-unstable-2017-03-22";
 
   src = fetchFromGitHub {
     owner = "erikg";
     repo = "vp";
-    rev = "v${version}";
-    sha256 = "08q6xrxsyj6vj0sz59nix9isqz84gw3x9hym63lz6v8fpacvykdq";
+    rev = "52bae15955dbd7270cc906af59bb0fe821a01f27";
+    hash = "sha256-AWRJ//0z97EwvQ00qWDjVeZrPrKnRMOXn4RagdVrcFc=";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [
+    autoreconfHook
+    SDL
+  ];
 
-  buildInputs = [ SDL SDL_image ];
+  buildInputs = [
+    SDL
+    SDL_image
+  ];
 
-  env.NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL -I${SDL_image}/include/SDL";
+  outputs = [ "out" "man" ];
 
-  meta = with lib; {
-    homepage = "https://brlcad.org/~erik/";
+  strictDeps = true;
+
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-I${lib.getDev SDL}/include/SDL"
+    "-I${lib.getDev SDL_image}/include/SDL"
+  ];
+
+  meta = {
+    homepage = "https://github.com/erikg/vp";
     description = "SDL based picture viewer/slideshow";
-    platforms = platforms.unix;
-    license  = licenses.gpl3;
-    maintainers = [ maintainers.vrthra ];
+    license  = lib.licenses.gpl3Plus;
     mainProgram = "vp";
+    maintainers = with lib.maintainers; [ AndersonTorres vrthra ];
+    inherit (SDL.meta) platforms;
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -14119,12 +14119,6 @@ with pkgs;
 
   vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { };
 
-  vp = callPackage ../by-name/vp/vp/package.nix {
-    # Enable next line for console graphics. Note that it requires `sixel`
-    # enabled terminals such as mlterm or xterm -ti 340
-    SDL = SDL_sixel;
-  };
-
   vtm = callPackage ../tools/misc/vtm { };
 
   witness = callPackage ../tools/security/witness { };