public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg: remove $man where it was only man3

Browse Source 
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.
This commit is contained in:
Vladimír Čunát 2015-10-25 19:34:30 +01:00
parent 6c75f4c9aa
commit 06eba7d320
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/servers/x11/xorg/overrides.nix
View File

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