Commit graph

274 commits

Author SHA1 Message Date
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