From 753cfbe09b06a40c35bc49f84d7ad9b128b0deff Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 21 Aug 2015 21:36:06 +0300 Subject: [PATCH] libXmu: Split into multiple outputs We need to override BITMAPDIR, since the default: -DBITMAPDIR=\"$(includedir)/X11/bitmaps\" would cause cycles between the outputs. Setting it to a nonexistent path doesn't affect the code logic, since the corresponding single-output directory $out/include/X11/bitmaps doesn't exist either. (cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e) --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bbd78c886cf1..a7464a12485e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -185,6 +185,11 @@ in outputs = [ "dev" "out" "man" ]; }; + libXmu = attrs: attrs // { + outputs = [ "dev" "out" "doc" ]; + buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"''; + }; + libXrandr = attrs: attrs // { outputs = [ "dev" "out" "man" ]; preConfigure = setMalloc0ReturnsNullCrossCompiling;