diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-03 01:02:51 +0300 |
| commit | e2c6740c37428f8d8185fcc907e9e619df50be85 (patch) | |
| tree | 13ed3247bd3f8d63305badcdf36557704e663478 /pkgs/servers/x11 | |
| parent | a1c24ab976eec1ae5a5c4c72122e17ff0a5e3a15 (diff) | |
| parent | adaee7352bcbcaafaddf7f0a5ef8b65099e06f6e (diff) | |
| download | nixlib-e2c6740c37428f8d8185fcc907e9e619df50be85.tar nixlib-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.gz nixlib-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.bz2 nixlib-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.lz nixlib-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.xz nixlib-e2c6740c37428f8d8185fcc907e9e619df50be85.tar.zst nixlib-e2c6740c37428f8d8185fcc907e9e619df50be85.zip | |
Merge commit 'adaee73' from staging into master
This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 52e012baf23f..1f2c616f1cfb 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -135,7 +135,7 @@ in ''; propagatedBuildInputs = [ xorg.libSM ]; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 @@ -158,7 +158,7 @@ in }; libXaw = attrs: attrs // { - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; propagatedBuildInputs = [ xorg.libXmu ]; }; @@ -220,11 +220,11 @@ in }; libXres = attrs: attrs // { - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; }; libXv = attrs: attrs // { - outputs = [ "out" "dev" "docdev" ]; + outputs = [ "out" "dev" "devdoc" ]; }; libXvMC = attrs: attrs // { |