From 06eba7d3202c361457d53d270d2d5538beab78f8 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 19:34:30 +0100
Subject: xorg: remove $man where it was only man3

Now man3 is deleted if not specified otherwise,
and I don't really see a reason for X libs to produce them.
(This fixes failures due to not producing $man outputs.)

The $doc outputs are also development docs (all probably),
but I left those for now.
---
 pkgs/servers/x11/xorg/overrides.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 3b72494e896..0999605b91c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -73,7 +73,7 @@ in
   libxcb = attrs : attrs // {
     nativeBuildInputs = [ args.python ];
     configureFlags = "--enable-xkb --enable-xinput";
-    outputs = [ "dev" "out" "doc" "man" ];
+    outputs = [ "dev" "out" "doc" ];
   };
 
   xcbproto = attrs : attrs // {
@@ -98,7 +98,7 @@ in
   };
 
   libXau = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXdmcp = attrs: attrs // {
@@ -115,7 +115,7 @@ in
   };
 
   libXxf86vm = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
@@ -146,7 +146,7 @@ in
   };
 
   libXcomposite = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     propagatedBuildInputs = [ xorg.libXfixes ];
   };
 
@@ -156,7 +156,7 @@ in
   };
 
   libXcursor = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXdamage = attrs: attrs // {
@@ -164,7 +164,7 @@ in
   };
 
   libXft = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     # the include files need ft2build.h, and Requires.private isn't enough for us
@@ -174,21 +174,21 @@ in
   };
 
   libXext = attrs: attrs // {
-    outputs = [ "dev" "out" "man" "doc" ];
+    outputs = [ "dev" "out" "doc" ];
     propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
   libXfixes = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXi = attrs: attrs // {
-    outputs = [ "dev" "out" "man" "doc" ];
+    outputs = [ "dev" "out" "doc" ];
   };
 
   libXinerama = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXmu = attrs: attrs // {
@@ -197,7 +197,7 @@ in
   };
 
   libXrandr = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     propagatedBuildInputs = [xorg.libXrender];
   };
-- 
cgit 1.4.1