Commit graph

152 commits

Author SHA1 Message Date
Benjamin Saunders a6f6c0eeeb libxcb: add xinput support (close #9835) 2015-09-13 10:51:21 +02:00
Domen Kožar 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
Tuomas Tynkkynen 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
Charles Strahan f178817aee xquartz: 1.14.6 -> 1.17.2
closes #9126
2015-08-05 13:57:02 -05:00
William A. Kennington III 09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
John Wiegley 23562aad59 Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9"
This reverts commit 5c896e5511, which was
a set of local changes unrelated to the commit title.
2015-07-30 16:21:39 -07:00
William A. Kennington III aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
John Wiegley 5c896e5511 emacs: Update Mac Port Emacs to 24.5-mac-5.9 2015-07-28 20:08:53 -07:00
Eelco Dolstra e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Vladimír Čunát a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
William A. Kennington III d8991a7b3b xf86-video-intel: 2.99.917 -> 2015-07-22 2015-07-22 13:14:27 -07:00
Vladimír Čunát 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
Vladimír Čunát 00dfcfb76a xorg: driver updates
Also fixup tarball list after e4316b8c17,
and drop a patch integrated in the update.
2015-07-19 13:33:03 +02:00
William A. Kennington III 8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
William A. Kennington III 061887e38a xf86-video-intel: Kernel 4.0 match 2015-06-16 23:37:05 -07:00
William A. Kennington III e4316b8c17 xorg-server: 1.16.4 -> 1.17.2 2015-06-16 23:36:11 -07:00
William A. Kennington III 57ee8d6131 xorgserver: Add gcc5 compat patch 2015-06-16 14:21:54 -07:00
Vladimír Čunát 3287103b00 xorg: add libXpresent and xcb-util-errors 2015-05-26 20:06:48 +02:00
Eric Seidel 662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang}
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Vladimír Čunát 3dba642c33 xorg: add xf86-input-libinput and xf86-video-i740 2015-04-18 07:11:55 +02:00
Vladimír Čunát 4b6b03e2ce xcb-util-cursor: autogenerate as other xorg pkgs
HEAD version still needed on darwin, reportedly:
https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
2015-04-18 07:08:45 +02:00
Nikita Mikhailov a29182a6f5 xorg: fix Xephyr 2015-04-11 11:34:35 +02:00
Eric Seidel 13dae62ec2 libxkbfile: patch for clang36 2015-03-24 20:54:47 -07:00
Nikolay Amiantov edaa3a7643 xorg-server: add Xephyr (close #6715) 2015-03-12 20:15:21 +01:00
aszlig 0ccf34039c
xorg.mxfontscale: Fix segfault with some fonts.
The update to version 1.1.2 in 9c22c1b introduces a segfault when
mkfontscale is processing fonts where the family name is missing.

Applies a patch from Stefan Dirsch <sndirsch@suse.com> to be found at:

https://bugs.freedesktop.org/show_bug.cgi?id=89409

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-11 16:57:21 +01:00
Vladimír Čunát 6c20e1d0bd xf86-video-vmware: drop patch included in update 2015-03-09 15:55:28 +01:00
Alexander V. Nikolaev 279d5af119 Proper default path for XKB config files 2015-02-24 21:38:30 +02:00
Vladimír Čunát 1982ac0b65 xorg.xinit: fix on Linux after #6160 2015-02-05 11:09:14 +01:00
Eric Seidel 7f7482b6bd fix xorgserver / xquartz on darwin 2015-02-04 15:14:36 -08:00
Shea Levy df430ab2ea Fix imake on darwin.
Taken from joelteon/nixpkgs@6b3f7e6fb0

Original author Mike Sperber <sperber@deinprogramm.de>
2015-02-04 10:00:50 +00:00
Sebastián Bernardo Galkin 06e6d7def2 xorg-server: enable DRI3 (close #5381)
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.
2014-12-18 18:17:42 +01:00
Vladimír Čunát ea557c8fd1 xorg xf86-input-evdev: update and add needed inputs 2014-12-03 13:26:32 +01:00
Eelco Dolstra a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Vladimír Čunát dcd2590c98 xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps) 2014-11-05 07:55:25 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Vladimír Čunát 95b475da09 xorg.xf86-input-vmmouse: fix build with glibc-2.20 2014-11-01 23:26:44 +01:00
Vladimír Čunát 4cc61d6d08 xorg.xf86-video-vmware: fix build against glibc-2.20 2014-11-01 22:29:42 +01:00
Vladimír Čunát 9877fdb39d xorg: updates some modules; mostly minor changes 2014-10-19 20:10:19 +02:00
Joel Taylor afa1db198b fix even more clang builds 2014-09-09 13:54:57 -07:00
Joel Taylor 374648deaa X11 build purity 2014-09-09 13:54:25 -07:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát 0f6ae6403e xorg: fix typo from the last xorg commit
Thanks to @falsifian for noticing it.
2014-08-24 09:55:22 +02:00
Vladimír Čunát 99e300c4f8 xorg: add xf86-video-qxl 2014-08-23 18:55:30 +02:00
Charles Strahan 5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Vladimír Čunát c50f0e47e1 freetype: major update, including some CVE security
- There's no fontconfig update yet, as I failed to debug it yet.
- Infinality patches are now taken from a different (maintained) source.
2014-06-17 09:00:29 +02:00
Vladimír Čunát 137eae0b55 Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
Vladimír Čunát 9ddc57cbea xorg.xf86-video-vmware: minor update
Patch no longer needed to build.
2014-03-27 22:14:51 +01:00
Vladimír Čunát 576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Lluís Batlle i Rossell fa5a583098 Bringing back the xkeyboard-config eo patch 2014-03-24 10:42:00 +01:00