diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-08-21 21:36:06 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 16:36:21 +0200 |
commit | 753cfbe09b06a40c35bc49f84d7ad9b128b0deff (patch) | |
tree | e2c401388ccb3423fcdc0f445458b9e733b59672 /pkgs/servers | |
parent | 2f7568e0928a4c0de64e8a63aee1eb015fad8940 (diff) | |
download | nixlib-753cfbe09b06a40c35bc49f84d7ad9b128b0deff.tar nixlib-753cfbe09b06a40c35bc49f84d7ad9b128b0deff.tar.gz nixlib-753cfbe09b06a40c35bc49f84d7ad9b128b0deff.tar.bz2 nixlib-753cfbe09b06a40c35bc49f84d7ad9b128b0deff.tar.lz nixlib-753cfbe09b06a40c35bc49f84d7ad9b128b0deff.tar.xz nixlib-753cfbe09b06a40c35bc49f84d7ad9b128b0deff.tar.zst nixlib-753cfbe09b06a40c35bc49f84d7ad9b128b0deff.zip |
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)
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 5 |
1 files changed, 5 insertions, 0 deletions
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; |