Commit graph

229 commits

Author SHA1 Message Date
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
Eelco Dolstra
932d5bee54 * X.org 7.7 RC1. Note that xorg-server doesn't build yet.
svn path=/nixpkgs/branches/x-updates/; revision=34147
2012-05-16 22:06:27 +00:00
Lluís Batlle i Rossell
6a838a4ba1 Making x11perf build.
svn path=/nixpkgs/trunk/; revision=33651
2012-04-06 18:33:51 +00:00
Lluís Batlle i Rossell
b24bab3873 Getting a much newer version of the openchrome X driver
svn path=/nixpkgs/trunk/; revision=33405
2012-03-25 13:53:07 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Arie Middelkoop
b4d5957ac4 Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon.
svn path=/nixpkgs/trunk/; revision=32035
2012-02-05 00:43:54 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons
8045c6ebe2 dri-proto: upgraded to version 2.6 so that we can use intel 2.17 driver
svn path=/nixpkgs/trunk/; revision=31773
2012-01-21 18:47:40 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Peter Simons
5ebdf058cc intel X driver: upgraded to fix display glitches on newer chips
at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).

I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).

svn path=/nixpkgs/trunk/; revision=31661
2012-01-18 20:38:30 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Peter Simons
fedda96bee xf86-video-ati: updated to version 6.14.3
svn path=/nixpkgs/trunk/; revision=31471
2012-01-10 20:12:25 +00:00
Florian Friesdorf
2e31e7293a moved parts of extra.list back to tarballs-7.6.list
also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
2011-12-31 15:37:51 +00:00
Florian Friesdorf
d2e8c37e41 default.nix now fully generated again
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
2011-12-31 06:07:37 +00:00
Florian Friesdorf
1745900396 add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list
svn path=/nixpkgs/trunk/; revision=31184
2011-12-31 06:07:34 +00:00