From 846d8f8305192dcc3a63139102698b4ac6b9ef9f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 27 Jul 2018 23:00:57 +0200
Subject: [PATCH] jq: split outputs and run tests

---
 pkgs/development/tools/jq/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 491d65d8882..6ee8c4074b7 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
   };
 
+  outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
+
   buildInputs = [ oniguruma ];
 
   patches = [
@@ -25,11 +27,19 @@ stdenv.mkDerivation rec {
   ];
   patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released
 
+  configureFlags =
+    [
+    "--bindir=\${bin}/bin"
+    "--sbindir=\${bin}/bin"
+    "--datadir=\${doc}/share"
+    "--mandir=\${man}/share/man"
+    ]
   # jq is linked to libjq:
-  configureFlags = stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
+    ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
 
-  installCheckPhase = "$out/bin/jq --help";
+  installCheckPhase = "$bin/bin/jq --help >/dev/null";
   doInstallCheck = true;
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = ''A lightweight and flexible command-line JSON processor'';