db11d7fd2b
xf86-input-libinput: 0.25.1 -> 0.26.0
2017-10-15 12:13:58 -05:00
35f894860d
xf86-video-intel: fixup after #29039
...
This was one package in pkgs/servers/x11/xorg/default.nix
that was *not* generated, and that was missed in the PR
and overwritten (understandably).
Now the change is properly in overrides.nix to prevent that...
2017-10-08 10:55:34 +02:00
35b4c8be51
xorg-server: fixup build after #29039
...
The expression uncarefully overrode whole nativeBuildInputs,
so after the pkgconfig move it got removed and the build failed.
1.19.3 doesn't need these lines anyway...
2017-10-07 09:38:42 +02:00
f8a18cd4cf
misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
...
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04:00
531e4b80c9
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
...
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
ebdbc08583
xorg: Split some man outputs from doc
...
Because soon manpages won't go to $doc anymore.
2017-08-11 21:32:53 +03:00
14bd516fa6
xf86-video-intel: build intel-virtual-output
2017-08-04 03:32:29 +02:00
7445649387
xorg-input-libinput: 0.25.0 -> 0.25.1
...
This isn't part of a full xorg release, so I just added it to the xorg
overrides.nix.
Changelog and release announcement:
https://lists.x.org/archives/xorg-announce/2017-May/002798.html
2017-06-04 13:47:05 -04:00
6bce07f876
xorg xf86-video-openchrome: 0.3.3 -> 0.6.0
...
Now it builds (again), but I haven't tested it in any other way.
2017-04-02 15:26:46 +02:00
da3c0ac19c
xorg.xorgserver: security 1.19.1 -> 1.19.2
...
Various bugfixes including CVE-2017-2624.
It seems to run without any problems for me.
2017-03-04 09:05:22 +01:00
56e624b155
xorg.xf86videoxgi: fix build with upstream patch
2017-02-27 12:43:58 +01:00
3348905cde
xorg-server: major bump 1.18.4 -> 1.19.1
...
I encountered no problems with it. Nvidia binary drivers are tested,
and AMD ones now both set `abiCompat` to use older server versions.
2017-02-12 13:24:44 +01:00
ffefd83897
xorg xf86-video-*: bump drivers that seem unused
...
I verified they build, at least with xorg-server-1.19.1.
2017-02-12 12:57:42 +01:00
ce9d30e734
Merge #22241 : amdgpu-pro: 16.50 -> 16.60
2017-02-07 20:49:58 +01:00
905627c7c5
xorg-server: fglrxCompat -> abiCompat
...
Allows it to be used for fglrx (1.17) and amdgpu-pro (1.18)
2017-02-06 23:16:21 -04:00
4675cb78cb
xorg.libXpm: 3.5.11 -> 3.5.12
2017-02-03 13:14:39 +01:00
08e99191f6
remove xorg.intelgputools in favor of intel-gpu-tools
...
There is no reason in having both and the latter is a
separate derivation and thus easier to maintain.
Closes #21976
2017-01-18 21:47:22 +01:00
69ed58d88f
xorg.xserver: configure --with-xkb-path= ( #21653 )
2017-01-18 02:57:15 +03:00
289782b94b
xorg.xrandr: remove unnecessary xkeystone binary
...
Fixes #21714 (see this for more information)
2017-01-11 19:53:38 +01:00
33abc705b3
xorg-server variants: eradicate symlink to /var/tmp
...
- Fixes #19673 ; it caused problems in combination with buildEnv.
- As noted, X falls back to /tmp:
https://github.com/NixOS/nixpkgs/issues/19673#issuecomment-258871876
- Removing the directory is still required, as X would attempt to write
into it if allowed - and probably succeed in case the user set
nix.readOnlyStore = false; (X runs as root).
- Archeology link: 9d1569316
2016-12-04 09:43:05 +01:00
4fee7fc82e
xorg.libXrender: propagate renderproto
...
Fixes #19909 ; there's a dependency between the headers.
2016-10-27 22:16:04 +02:00
e7ded267bd
xserver: replace XKB_BINDIR with compile time option
...
---
Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
55f489eb74
libXp: Use multiple outputs
2016-10-02 19:22:19 +02:00
b6f3e08019
xinput: Remove libXfixes.dev from the closure
2016-09-26 19:59:02 +02:00
e2c6740c37
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
2016-09-03 01:02:51 +03:00
79d673e21c
xorg: Mark obsolete xorgvideo* drivers broken
...
These are now showing up as broken builds in Hydra since 2daefaf457
2016-09-02 16:38:46 +03:00
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
d3dc3d4130
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
...
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
d4eb6887b9
xorg.xf86videoati: Use dev output of xorgserver
...
TODO: Darwin xorgserver should have consistent outputs with the Linux
one.
2016-08-30 02:41:12 +03:00
40dc278ee0
xorg.fontbhttf: mark as unfree
...
https://bugzilla.redhat.com/show_bug.cgi?id=317641
2016-08-29 22:40:32 +02:00
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
0865e22567
xorg.xf86videoxgi: add patch to fix build
2016-08-29 08:25:12 +00:00
24a9183f90
Merge branch 'hardened-stdenv' into staging
...
Closes #12895
Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
ab95a3ff7f
xorg xf86-video-amdgpu: init at 1.1.0
...
Fixes #17682 , closes #17857 .
The resulting binary is the same as in the PR,
but this uses auto-generated expression with override.
2016-08-21 11:32:26 +02:00
27b9f5d65e
xorg.*: disable relro/bindnow hardening
...
Breaks the module system at runtime otherwise.
2016-08-14 09:01:55 +00:00
f7da99c7ff
xorg.xorgserver: disable relro hardening
...
Fixes modesetting module loading.
2016-08-12 12:07:24 +00:00
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
0eb827918d
xorg.libpciaccess: Not supported on Darwin
...
http://hydra.nixos.org/build/38160825/nixlog/1/raw
2016-08-04 23:11:45 +03:00
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
17e94ebc6a
xorg.xcbutilcursor: Don't wipe out most meta attrs
2016-08-02 21:17:44 +03:00
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
5c9309c231
xorg.xorgserver: enable glamor support
2016-07-30 13:37:51 +02:00
1f04b4a566
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-21 00:56:43 +00:00
13fc6e56fe
Adding intel-gpu-tools to xorg.
2016-07-20 12:33:24 +02:00
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
a03ff26080
Merge #15639 : xorg-server 1.17.4 -> 1.18.3
...
... and fglrxCompat to maintain compatibility.
2016-06-05 00:52:06 +02:00
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
69cc0a7bc5
xf86-input-evdev: split dev output
2016-05-23 13:02:55 +02:00
ff2d137410
xorg: add fglrxCompat parameter
2016-05-22 22:16:12 +02:00
f4eb808554
xf86-input-synaptics: split dev output
2016-05-22 12:10:38 +02:00
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
668f93c719
xcb-util-cursor: multiple outputs
2016-04-25 19:04:24 -05:00
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
936dfeb700
xorg.sessreg: Fix build on gcc-5
2016-01-30 16:36:57 +00:00
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
9e8eba48ab
xorg.xorgserver: wrap Xvfb with required flags
2016-01-17 21:14:49 +01:00
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
848064cef6
remove old patches and attributes from xorgserver
2015-12-16 12:03:29 -08:00
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
020f6cfadc
xorg-server: 1.17.2 -> 1.18.0
2015-11-17 21:11:53 -08:00
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
61c6597246
Bringing back eo symbols for xkb
...
I port the patch for esperanto symbols removed in
1be2acd1317aadc8e1a08d17312e524fb5fc2a4300 to the current
xkeyboardconfig.
(cherry picked from commit 4a830de0323e34592a36dea660d9a3ec8348964e)
2015-10-29 13:32:35 +01:00
c749714170
clean up xquartz arguments
2015-10-28 13:56:13 -07:00
787f322540
$docdev fixups: mostly to avoid empty output
...
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
e153b68fce
xorg-server: avoid runtime references to xorgserver-dev
2015-10-28 10:22:58 +01:00
db81e22148
treewide: Mass-replace 'xorgserver}/bin' with correct output
...
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
c7e3ee4153
libXvMC: Split into multiple outputs
2015-10-28 10:17:11 +01:00
06eba7d320
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.
2015-10-28 10:17:07 +01:00
5469e9c581
fix xquartz build
2015-10-26 18:37:05 -07:00
cf12f3e4d2
patch out system include in libAppleWM
2015-10-26 17:13:29 -07:00
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
801a843bdb
xorg.xorg-server: use the generated expression
...
... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.
2015-10-19 09:35:07 +02:00
e25da7e5c8
xorg: split outputs of various libs
2015-10-14 14:27:07 +02:00
fa6ddd7fa6
xorg.{libICE,libSM}: split dev and doc outputs
2015-10-13 20:19:01 +02:00
783c40eb68
dbus: split into multiple outputs and fix referrers
2015-10-13 20:19:01 +02:00
47305626ab
xorg{xcb-util-keysyms,libxkbfile}: split the dev output
2015-10-13 20:18:59 +02:00
e4f38fb050
xorg.xcb-util: split into multiple outputs
...
I see no references likely to break.
2015-10-05 16:00:55 +02:00
32b31398eb
xorg.libXt: re-split into multiple outputs
...
Fixed all 'libXt}' references, too.
2015-10-05 11:23:34 +02:00
753cfbe09b
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)
2015-10-03 16:36:21 +02:00
0100b27069
imake: Add uberhack to workaround broken 'gcc -x c'
...
Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)
What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
2015-10-03 14:08:51 +02:00
947542be6d
libxft: Fix reference to incorrect output
2015-10-03 14:08:50 +02:00
f72376fd20
x11: Remove conflicting outputs produced by auto merge
2015-10-03 13:39:33 +02:00
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
4f9ef9bbfb
give xquartz impure deps to make it build
2015-09-28 14:45:45 -07:00
76a6539829
work on making xquartz buildable in a pure environment
2015-09-22 16:27:51 -07:00
d78936131a
preparation for being able to build xquartz
2015-09-17 16:11:18 -07:00
a6f6c0eeeb
libxcb: add xinput support ( close #9835 )
2015-09-13 10:51:21 +02:00
66214fba8d
Xorg: apply patch to fix X crashes
...
(cherry picked from commit dc0fe8ebf40b7724de1ca0b195236854591fdb5f)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-04 18:47:40 +02:00
6b866a37fc
xrdb: Use mcpp as the preprocessor
...
Close #9501 , fixes #9480 .
By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).
Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
2015-08-29 08:29:59 +02:00
f178817aee
xquartz: 1.14.6 -> 1.17.2
...
closes #9126
2015-08-05 13:57:02 -05:00
09b4a7cc1b
Merge branch 'master.upstream' into staging.upstream
2015-07-31 17:26:20 -07:00
23562aad59
Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9"
...
This reverts commit 5c896e5511
2015-07-30 16:21:39 -07:00
aaef42ab8c
Merge branch 'master.upstream' into staging.upstream
2015-07-29 10:23:08 -07:00
5c896e5511
emacs: Update Mac Port Emacs to 24.5-mac-5.9
2015-07-28 20:08:53 -07:00
e1f78bf677
More docs/manpages in separate outputs
2015-07-27 00:27:54 +02:00
a2f16fdcff
Merge branch 'staging'
2015-07-24 15:12:28 +02:00
d8991a7b3b
xf86-video-intel: 2.99.917 -> 2015-07-22
2015-07-22 13:14:27 -07:00
1be2acd131
xkeyboard-config: updates
...
Also drop Esperanto patch for now, as it doesn't apply anymore
and there are some Esperanto variants inside. Discussed:
https://github.com/NixOS/nixpkgs/commit/fa5a583098
2015-07-19 13:33:04 +02:00
00dfcfb76a
xorg: driver updates
...
Also fixup tarball list after e4316b8c17
2015-07-19 13:33:03 +02:00
Yegor Timoshenko
Vladimír Čunát
John Ericson
Tuomas Tynkkynen
Carter Charbonneau
Benjamin Staffin
Robin Gloster
David McFarland
Michael Raskin
Pascal Wittmann
volth
Alexander Ried
Eelco Dolstra
Eelco Dolstra
Tuomas Tynkkynen
obadz
Gabriel Ebner
Lluís Batlle i Rossell
Franz Pletz
Thomas Tuegel
Domen Kožar
Jude Taylor
Luca Bruno
William A. Kennington III
Benjamin Saunders
Charles Strahan
John Wiegley