Commit Graph

341 Commits

Author SHA1 Message Date
Jörg Thalheim
220dcada79
xorg.libXvMC: fix cross-build 2018-12-12 08:02:19 +00:00
Frederik Rietdijk
3e950d584c Merge staging-next into master 2018-12-08 16:29:21 +01:00
Will Dietz
5eff07f211 xf86videointel: 2017-10-19 -> 2018-12-03 2018-12-07 21:07:33 -06:00
Jörg Thalheim
84162175a3
Merge pull request #51180 from mayflower/xorg-cross
treewide: cross-fixes
2018-12-01 00:43:02 +00:00
Robin Gloster
b7893a700d
xorg.libXv: fix cross 2018-11-29 03:37:57 +01:00
Matthew Bauer
613e262fc2 imake: add setup hook 2018-11-28 20:14:33 -06:00
Robin Gloster
2d0fad757a
xorg: generate python into nativeBuildInputs 2018-11-28 14:28:32 +01:00
Robin Gloster
602efddc24
xorg.libX11: fix cross 2018-11-28 14:02:01 +01:00
Daiderd Jordan
ecf7c9c4b4
xorg.xorgserver: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _X11ApplicationMain in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in libxpbproxy.a(x-selection.o)
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
          objc-class-ref in libXquartz.a(X11Controller.o)
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in libXquartz.a(X11Application.o)
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table29 in libxpbproxy.a(x-selection.o)
    ld: symbol(s) not found for architecture x86_64
2018-11-06 19:00:03 +01:00
Bart Bakker
f565b95ca3
xorg.xf86videovmware: fix for GFX support
Fix the mesa dependency for `xorg.xf86videovmware`. Add `llvm_6` because
`mesa_noglu` has a runtime dependency on clang (see TODO in
`development/libraries/mesa`).
2018-10-27 09:57:29 +02:00
John Ericson
1147d2ed89 Merge remote-tracking branch 'upstream/master' into xorg-override 2018-10-18 12:00:37 -04:00
John Ericson
88cd633ea4 xorg: Don't use deprecated item 2018-10-18 11:54:20 -04:00
Andrew Childs
fb9604c4b7 xorg: simplify argument passing into xorg and overrides 2018-10-11 15:03:06 -04:00
Andrew Childs
9454f71fef xorg: allow overriding via overrideScope 2018-10-11 13:41:27 -04:00
Will Dietz
55a5236630 xf86-input-libinput: 0.26.0 -> 0.28.0
https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/log/
2018-09-21 07:58:57 -05:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Pascal Wittmann
0fa1ffd17f
xlsfonts: set license in overrides 2018-08-04 16:04:51 +02:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
John Ericson
db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
David McFarland
2b7fe3bf5a xorg: replace edits to generated script
- update versions in .list files to match
- move cf-files postInstall to overrides.nix
2018-05-19 17:21:40 -03:00
John Ericson
5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson
330ca731e8 treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
John Ericson
8e891e6ed4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 10:57:33 -04:00
Vladimír Čunát
3b6486f857
xorg.xorgserver: drop makeWrapper
It's been unused since 65da25997d.
2018-05-13 21:19:02 +02:00
Jörg Thalheim
991f8db51a xorgserver: add mesa_noglu for dri package 2018-05-13 14:42:13 +01:00
John Ericson
2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
Matthew Bauer
c839771129 xquartz: fix build
Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196
2018-05-11 23:55:59 -05:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Will Dietz
64c2e058e6 mesa, libglvnd, xorg: disable tls w/musl 2018-04-24 17:16:22 -05:00
Nikolay Amiantov
65da25997d xorg.xorgserver: don't use XORG_DRI_DRIVER_PATH
Our patch which adds this envvar has been removed.
2018-03-26 14:01:49 +03:00
Nikolay Amiantov
a798ec30f9 xorg: update autogeneration script
* Fix shebang so that it's usable on NixOS;
* Enable warnings (they were enabled with Perl flag before);
* Switch from mesa to libGL.
2018-03-26 14:01:49 +03:00
Shea Levy
d0a8866622
Merge branch 'binutils-2.30' into staging 2018-03-22 07:28:10 -04:00
Matthew Justin Bauer
ce01740dae
Merge pull request #33685 from corngood/amdgpu-pro-upgrade
amdgpu-pro: 17.10 -> 17.40
2018-03-19 12:40:03 -05:00
Shea Levy
0f172e971c
libxshmfence: Bump to 1.3.
Needed with glibc-2.27.
2018-03-17 21:58:14 -04:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Will Dietz
e7580d0f92 xorgserver: Builds! small workaround re:bad types 2018-02-13 09:44:55 -06:00
David McFarland
ebf1dade82 xorg: allow and check abiCompat on current version 2018-01-12 00:09:15 -04:00
adisbladis
c2316114bc
stdenv: Kill off ensureDir 2018-01-09 11:14:48 +08:00
Vladimír Čunát
e001bd2c2f
xorg-server-1.18: fixup build with glibc-2.26
It's non-default version required by amdgpu-pro ATM.  Thanks to Mounium.
2017-12-03 16:23:45 +01:00
Orivej Desh
6eddd8081f xorg.fontmiscmisc: make the misc fonts available
Xorg was rejecting font directories with symlinks since
db6adec156.
2017-12-01 10:37:03 +00:00
Tuomas Tynkkynen
86ad1451f2 xorg: Mark some xf86* drivers x86-only
https://hydra.nixos.org/eval/1413937?filter=xorg&compare=1358674
2017-11-30 19:03:14 +02:00
Vladimír Čunát
5f020d5627
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
2017-11-29 10:02:40 +01:00
Orivej Desh
4549190441 xorg.bitmap: provide resource search path 2017-11-29 04:29:43 +00:00
Vladimír Čunát
f6fe84d15d
xorg.bdftopcf: 1.0.5 -> 1.1 2017-11-27 13:09:19 +01:00
Tuomas Tynkkynen
9812babaef xorg.xf86inputlibinput: Split dev output
Closure goes from 160M -> 42M
2017-10-28 14:54:35 +03:00
Joerg Thalheim
c1addcdffa xf86-video-intel: 2017-04-18 -> 2017-10-19 2017-10-25 01:44:04 +01:00
Yegor Timoshenko
db11d7fd2b xf86-input-libinput: 0.25.1 -> 0.26.0 2017-10-15 12:13:58 -05:00
Vladimír Čunát
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
Vladimír Čunát
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
John Ericson
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
John Ericson
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
Tuomas Tynkkynen
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
Carter Charbonneau
14bd516fa6 xf86-video-intel: build intel-virtual-output 2017-08-04 03:32:29 +02:00
Benjamin Staffin
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
Vladimír Čunát
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
Vladimír Čunát
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
Robin Gloster
56e624b155
xorg.xf86videoxgi: fix build with upstream patch 2017-02-27 12:43:58 +01:00
Vladimír Čunát
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
Vladimír Čunát
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
Vladimír Čunát
ce9d30e734
Merge #22241: amdgpu-pro: 16.50 -> 16.60 2017-02-07 20:49:58 +01:00
David McFarland
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
Michael Raskin
4675cb78cb xorg.libXpm: 3.5.11 -> 3.5.12 2017-02-03 13:14:39 +01:00
Pascal Wittmann
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
volth
69ed58d88f xorg.xserver: configure --with-xkb-path= (#21653) 2017-01-18 02:57:15 +03:00
Robin Gloster
289782b94b
xorg.xrandr: remove unnecessary xkeystone binary
Fixes #21714 (see this for more information)
2017-01-11 19:53:38 +01:00
Vladimír Čunát
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
Vladimír Čunát
4fee7fc82e
xorg.libXrender: propagate renderproto
Fixes #19909; there's a dependency between the headers.
2016-10-27 22:16:04 +02:00
Alexander Ried
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
Eelco Dolstra
55f489eb74 libXp: Use multiple outputs 2016-10-02 19:22:19 +02:00
Eelco Dolstra
b6f3e08019 xinput: Remove libXfixes.dev from the closure 2016-09-26 19:59:02 +02:00
Tuomas Tynkkynen
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
Tuomas Tynkkynen
79d673e21c xorg: Mark obsolete xorgvideo* drivers broken
These are now showing up as broken builds in Hydra since 2daefaf457.
None of these compiled even in 16.03 and I think all of them are
for pretty obsolete hardware, so just mark them as broken.

(In principle the xorg generator could be made to ignore them but that
would be more work.)
2016-09-02 16:38:46 +03:00
Eelco Dolstra
8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
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
Tuomas Tynkkynen
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
Vladimír Čunát
40dc278ee0 xorg.fontbhttf: mark as unfree
https://bugzilla.redhat.com/show_bug.cgi?id=317641
2016-08-29 22:40:32 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
0865e22567
xorg.xf86videoxgi: add patch to fix build 2016-08-29 08:25:12 +00:00
obadz
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
Vladimír Čunát
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
Robin Gloster
27b9f5d65e xorg.*: disable relro/bindnow hardening
Breaks the module system at runtime otherwise.
2016-08-14 09:01:55 +00:00
Robin Gloster
f7da99c7ff xorg.xorgserver: disable relro hardening
Fixes modesetting module loading.
2016-08-12 12:07:24 +00:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Tuomas Tynkkynen
0eb827918d xorg.libpciaccess: Not supported on Darwin
http://hydra.nixos.org/build/38160825/nixlog/1/raw
2016-08-04 23:11:45 +03:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
17e94ebc6a xorg.xcbutilcursor: Don't wipe out most meta attrs 2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Gabriel Ebner
5c9309c231 xorg.xorgserver: enable glamor support 2016-07-30 13:37:51 +02:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Lluís Batlle i Rossell
13fc6e56fe Adding intel-gpu-tools to xorg. 2016-07-20 12:33:24 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Vladimír Čunát
a03ff26080 Merge #15639: xorg-server 1.17.4 -> 1.18.3
... and fglrxCompat to maintain compatibility.
2016-06-05 00:52:06 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát
69cc0a7bc5 xf86-input-evdev: split dev output 2016-05-23 13:02:55 +02:00
Vladimír Čunát
ff2d137410 xorg: add fglrxCompat parameter 2016-05-22 22:16:12 +02:00
Vladimír Čunát
f4eb808554 xf86-input-synaptics: split dev output 2016-05-22 12:10:38 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Thomas Tuegel
668f93c719 xcb-util-cursor: multiple outputs 2016-04-25 19:04:24 -05:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00