Vladimír Čunát
e3ff0f116f
vmware driver: depend on mesa_drivers to find libxatracker
2013-05-23 22:52:46 +02:00
Vladimír Čunát
0b416310fc
xorg-server: clear the bogus font paths
2013-04-25 16:57:36 +02:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Evgeny Egorochkin
5084f47e47
Add a working mirror for xcb-util-renderutil
2013-04-21 05:31:31 +03:00
Vladimír Čunát
c859a46712
xorg: update xorgserver to 1.13.4, and more
...
- update some modules to work with the newer server
- fix many other modules via overrides
- huge cleanup in overrides via better propagation
and pixman include flattening
- URLs of XCB stuff have been moved
2013-04-18 21:33:17 +02:00
Vladimír Čunát
7716b78fc7
pixman: use pixman_cairo for xorg, flatten its includes
2013-04-18 21:31:56 +02:00
Vladimír Čunát
a40e825474
xorg-server: fix CVE-1940
...
http://lists.x.org/archives/xorg-devel/2013-April/036014.html
It's a low-priority issue, but it should cause almost no rebuilds.
2013-04-18 12:50:26 +02:00
Jaka Hudoklin
83afbf45ca
Add xf86videodummy and xf86inputvoid to xorg overrides (pixman fix)
2013-03-30 11:52:44 +01:00
Shea Levy
fc3994074e
Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs
...
The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:19:02 -05:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Sander van der Burg
31c198a40e
xf86-video-intel: bump to 2.20.19
2013-03-05 10:18:05 +01:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Patrick Wheeler
8cdfd46d96
Fix xf86vmware fix
...
Moved xf86vmware fix into the overrides.nix file where and not in the
generated default.nix.
2013-03-02 01:08:33 +01:00
Patrick John Wheeler
d5ec021cdb
Making xlibs.xf86videovmware build
2013-02-27 06:44:41 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
aszlig
bf3d3dd19b
xinit: Fix logpath and dependencies for startx.
...
It seems that (almost?) all NixOS users start X using the services module,
because startx seems to be broken for quite some while. And it hit me while
getting to NixOS for the first time as well, so I then decided to just use the
service module.
As I'm working with multiple X servers, writing wrappers in ~/nixpkgs/config.nix
became tedious and so I decided to fix it, hopefully without breaking anything.
The fix consists of:
* Provide a default location for the Xorg log (~/.xorg.log - hope that's okay)
* Expose xauth through xinit to ensure purity and "unexpected behaviour", also
known as "simply not working", because xauth isn't in the user's environment.
* Actually provide the X binary so it doesn't have to be passed to startx every
time.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:19 +01:00
Eelco Dolstra
72684fb42f
Remove support for the obsolete powerpc-darwin and i686-darwin platforms
2012-11-29 14:10:49 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Lluís Batlle i Rossell
38153d9105
xf86 video openchrome: fixing the build, changing overrides.
2012-11-18 22:19:00 +01:00
Alexander Foremny
58d68427c6
Fix xf86-video-sis
2012-11-18 20:16:54 +01:00
James Cook
01d749f0aa
Rolled back xf86-video-ati to 6.14.4.
...
6.14.6 requires a newer version of libdrm, which in turn requires a newer
version of mesa. I cheated and edited the generated default.nix file instead of
re-generating it, since generate-expr-from-tarballs.pl complained of a collision
between two tarballs providing different versions of xorg-server.
2012-10-26 14:03:07 +02:00
Michael Raskin
47d3d58ec6
Fix xwd build
2012-10-19 13:50:02 +04:00
Michael Raskin
0e930058ae
Update TigerVNC to SVN checkout that at least builds..
2012-10-18 20:49:22 +04:00
Eelco Dolstra
31212a0a95
Fix font-cursor-misc build
2012-10-15 13:14:12 -04:00
Peter Simons
87c5696996
pkgs/servers/x11/xorg/overrides.nix: correctly patch path to mkfontscale into mkfontdir wrapper script
2012-10-15 19:06:59 +02:00
Eelco Dolstra
80fa05f1f5
xf86-video-intel: Update to 2.20.10
2012-10-15 12:09:28 -04:00
Eelco Dolstra
3b968053d4
Fix font-schumacher-misc build
...
http://hydra.nixos.org/build/3157818
2012-10-15 11:52:11 -04:00
Peter Simons
70334f04ee
pkgs/servers/x11/xorg/overrides.nix: xinput needs libXrender to build
2012-10-14 20:28:00 +02:00
Eelco Dolstra
90d9f8ec18
Update xcb-proto and libxcb
2012-10-08 15:15:05 -04:00
Eelco Dolstra
281fa6f85a
Revert "xorg-server: Boldly update to 1.13.0"
...
This reverts commit 2f2426a02f89458451de0570ee6f0bf1442a3619.
xf86-video-intel requires a newer version of libdrm, which in turn
breaks mesa. So stick to 1.12.4 until this gets sorted out.
2012-09-28 17:44:38 -04:00
Eelco Dolstra
1b807c2acd
xorg-server: Boldly update to 1.13.0
2012-09-28 17:44:38 -04:00
Eelco Dolstra
4a6a87eedc
Fix builds depending on libXft
2012-09-27 12:38:48 -04:00
Eelco Dolstra
2fed9dfbc5
Some X.org updates (include xorg-server to 1.12.4)
2012-09-26 16:11:26 -04:00
Eelco Dolstra
d5758c99a3
Merge remote-tracking branch 'origin/master' into x-updates
...
Conflicts:
pkgs/misc/maven/maven-1.0.nix
pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Eelco Dolstra
f590586775
xorg-server: Enable the SECURITY extension
...
This allows "ssh -X" to do the right thing.
2012-09-18 17:10:36 -04:00
Shea Levy
5315a0bb6d
xf86-input-keyboard: Needs pixman
2012-07-15 22:56:49 -04:00
Shea Levy
27339f2ad8
xf86-input-mouse: Needs pixman
2012-07-15 22:55:12 -04:00
Shea Levy
4f01e68ff8
xf86-input-synaptics: Needs mtdev and pixman
2012-07-15 22:53:43 -04:00
Shea Levy
d382822803
xf86-video-ati: Needs pixman
2012-07-15 22:48:28 -04:00
Shea Levy
ccceaba50a
xf86-video-cirrus: Needs pixman
2012-07-15 22:47:27 -04:00
Shea Levy
08e7a18a2c
xf86-video-nv: Needs pixman
2012-07-15 22:45:57 -04:00
Shea Levy
c95e6d5dc4
xf86-video-vesa: Need pixman
2012-07-15 22:44:11 -04:00
Shea Levy
a55bcacbe2
xorg-video-unichrome: Update git url, fix build with new xorg
2012-07-15 22:40:52 -04:00
Shea Levy
f0b7c9813b
xorg.ev: Needs libXrender
2012-07-15 03:36:48 -04:00
Shea Levy
65ac9694c7
xorg: evdev and fbdev need pixman
2012-07-14 16:26:22 -04:00
Shea Levy
fdf6f17a1b
x11: Some fonts need mkfontscale
...
There may be others, these are just the ones that needed it for my configuration to build
2012-07-14 16:16:31 -04:00
Shea Levy
d6d6b623c9
xorgserver: Update xkbcomp-path patch
...
_XkbDupString was migrated to Xstrdup
2012-07-14 15:13:08 -04:00
Shea Levy
13c5b75b80
xorgserver: Add needed deps
2012-07-14 15:07:36 -04:00
Shea Levy
bb469d5e25
xorgserver: Update dir path patch
2012-07-14 15:03:36 -04:00
Shea Levy
71e0a3fb93
x.org: Update to 7.7
2012-07-14 14:33:58 -04:00