Commit graph

170 commits

Author SHA1 Message Date
Eelco Dolstra 5eef7df51d * intltool: deleted redundant copy (it's already in the Gnome Nix
expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
2008-10-09 12:12:58 +00:00
Eelco Dolstra 9fa8276ae5 * X.org 7.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13006
2008-10-08 17:02:48 +00:00
Michael Raskin e1f4d60dca Added fresh radeonhd to X.org expression.
svn path=/nixpkgs/trunk/; revision=12205
2008-06-28 07:10:51 +00:00
Michael Raskin c750b3e602 Added dependencies to build ATi driver..
svn path=/nixpkgs/trunk/; revision=12113
2008-06-16 06:27:21 +00:00
Michael Raskin 7c840c0f0f Fixing evdev X11 input driver build
svn path=/nixpkgs/trunk/; revision=12103
2008-06-15 16:55:27 +00:00
Michael Raskin f7ccbf7c80 Update X.org server: security fix
svn path=/nixpkgs/trunk/; revision=12082
2008-06-13 17:24:14 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Eelco Dolstra 319feed942 * Latest Cairo / GTK.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11692
2008-04-23 10:48:10 +00:00
Michael Raskin 6f35c8fdf8 Added option for newer ATi drivers in X.org
svn path=/nixpkgs/trunk/; revision=11558
2008-04-11 09:24:16 +00:00
Eelco Dolstra e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
2008-02-20 23:02:41 +00:00
Yury G. Kudryashov c0496c0413 X.Org: added dbus, hal; removed unused gettext
svn path=/nixpkgs/branches/stdenv-updates/; revision=10467
2008-02-02 20:42:55 +00:00
Yury G. Kudryashov fb31183364 xorg: deault.nix and generate-expr-from-tarballs.pl synced
svn path=/nixpkgs/trunk/; revision=10318
2008-01-28 19:31:59 +00:00
Yury G. Kudryashov a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Michael Raskin 4290be9a99 Various fixes to lessen reliance on nix.cs.uu.nl for tarballs; version bumps for unavailabel tarballs; ATI driver builds now
svn path=/nixpkgs/trunk/; revision=9952
2007-12-18 22:56:12 +00:00
Yury G. Kudryashov 95f5f51bae X.Org builder: always autoPropagate buildInputs
svn path=/nixpkgs/branches/stdenv-updates/; revision=9823
2007-12-01 20:05:42 +00:00
Eelco Dolstra f64beb4b58 * Fix a regression in setxkbmap: it couldn't find its rules anymore.
svn path=/nixpkgs/trunk/; revision=9794
2007-11-26 13:46:58 +00:00
Yury G. Kudryashov e43ce8f723 xorg: deault.nix and generate-expr-from-tarballs.pl synced
svn path=/nixpkgs/branches/stdenv-updates/; revision=9761
2007-11-19 22:29:08 +00:00
Michael Raskin 61f4326752 Added possibility to enable SVG in ImageMagick, updated pidgin-latex, added missed xorgserver xkb patch.
svn path=/nixpkgs/trunk/; revision=9623
2007-11-11 07:54:45 +00:00
Michael Raskin f38d6d0f15 Fixed a LED bug; patch taken from bugs.freedesktop.org
svn path=/nixpkgs/trunk/; revision=9622
2007-11-10 17:32:55 +00:00
Michael Raskin 43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant)
svn path=/nixpkgs/trunk/; revision=9613
2007-11-09 13:54:02 +00:00
Eelco Dolstra 806ff74e5a * Add the i810 driver back in (don't know yet if it still works).
svn path=/nixpkgs/trunk/; revision=9594
2007-11-06 11:49:13 +00:00
Eelco Dolstra b7f1b56b18 * X11R7.3.
svn path=/nixpkgs/trunk/; revision=9592
2007-11-05 23:59:55 +00:00
Michael Raskin c12137d608 Added some symlinks to make xkbrules work in xorg.conf for switching keymaps.
svn path=/nixpkgs/trunk/; revision=9031
2007-08-02 21:30:33 +00:00
Yury G. Kudryashov 40657fbece * ncurses: added symlinks for bynary packages linked against libncurses. Tested
with ghc. I will add 'unicode' option next check in (for cygwin).
* pidgin:  Got rid of builder.sh, added ncurses to the dependencies, so it builds
           finch.
* xorg:    Added glproto and mesaHeaders to xf86videosis dependencies. Now it
           compiles.
* pwgen:   Added.
* device-mapper: Version bump. Added 'static' option for use in initrd.
* lvm2:          Version bump. Added 'static' option for use in initrd.

svn path=/nixpkgs/trunk/; revision=8923
2007-06-28 09:53:12 +00:00
Michael Raskin 42f841bcab Added some descriptions.
svn path=/nixpkgs/trunk/; revision=8920
2007-06-26 11:49:45 +00:00
Eelco Dolstra 91e0b058af * Don't touch symlinks to which we don't have write permission.
svn path=/nixpkgs/trunk/; revision=8776
2007-05-25 14:10:38 +00:00
Eelco Dolstra 50cc2acd23 * xorg-server 1.3.0, xf86-video-intel 2.0.0.
svn path=/nixpkgs/trunk/; revision=8616
2007-04-26 18:36:01 +00:00
Eelco Dolstra 1971bb6829 * X.org server 1.2.99.905.
svn path=/nixpkgs/trunk/; revision=8595
2007-04-18 15:46:58 +00:00
Eelco Dolstra a29dbccc0f * Added the latest Intel video driver.
svn path=/nixpkgs/trunk/; revision=8594
2007-04-18 14:55:43 +00:00
Eelco Dolstra c214c7525d * setxkbmap: add a symlink to xkeyboard-config so that it can find the
rules files.  Maybe this should be done through an environment variable.

svn path=/nixpkgs/trunk/; revision=8496
2007-03-29 23:02:07 +00:00
Eelco Dolstra fc483e0d57 * Allow the path to xkbcomp to specified in an environment variable.
The X server by default looks for it under its own prefix, which
  isn't right.  Not being able to run xkbcomp causes the Xkb keyboard
  extension to fail (which incidentally is also the reason why
  Ctrl-Alt-Fn didn't work).

svn path=/nixpkgs/trunk/; revision=8494
2007-03-29 22:57:56 +00:00
Martin Bravenboer fb6d590e50 xorg libxcb: patch to disable assert that stops Java GUI apps from
working (the actual bug is in Java).


svn path=/nixpkgs/trunk/; revision=8189
2007-03-05 18:28:49 +00:00
Eelco Dolstra f6b15579b8 svn path=/nixpkgs/trunk/; revision=8065 2007-02-27 00:07:07 +00:00
Eelco Dolstra 8db3dbaf1a * Patched the X server to get the path of the DRI driver from the
environment, rather than relative to the X server's prefix.

svn path=/nixpkgs/trunk/; revision=8064
2007-02-26 23:50:03 +00:00
Eelco Dolstra 556cc5ed2f * Doh.
svn path=/nixpkgs/trunk/; revision=8063
2007-02-26 23:37:41 +00:00
Eelco Dolstra ba443448e8 * Build the i810 driver. Only depend on the Mesa headers, not all of Mesa.
svn path=/nixpkgs/trunk/; revision=8060
2007-02-26 23:10:25 +00:00
Eelco Dolstra 9f173879e3 * Don't call fc-cache (it tries to write in fontconfig's prefix).
svn path=/nixpkgs/trunk/; revision=8056
2007-02-26 21:04:36 +00:00
Eelco Dolstra 24399a3f49 * Dependencies on fontconfig.
svn path=/nixpkgs/trunk/; revision=8055
2007-02-26 20:46:56 +00:00
Eelco Dolstra 26a710ad67 * Hack to address a GNU Make impurity (NIXPKGS-45).
svn path=/nixpkgs/trunk/; revision=8054
2007-02-26 19:11:19 +00:00
Eelco Dolstra cd10e285d2 * Pass the Mesa source tree.
svn path=/nixpkgs/trunk/; revision=8052
2007-02-26 17:05:27 +00:00
Eelco Dolstra 3e19819c28 * X11R7.2 and associated updates.
svn path=/nixpkgs/trunk/; revision=8049
2007-02-26 16:32:27 +00:00
Eelco Dolstra 9a457db61d * Some font hackery.
svn path=/nixpkgs/trunk/; revision=8042
2007-02-25 15:54:15 +00:00
Eelco Dolstra b3b1daf131 * Add Bitstream Vera.
svn path=/nixpkgs/trunk/; revision=7751
2007-01-22 17:11:08 +00:00
Eelco Dolstra aa0918867b * Get some TTF fonts to work. Must merge with the generator.
svn path=/nixpkgs/trunk/; revision=7708
2007-01-17 17:18:14 +00:00
Eelco Dolstra 157b6cd18d * Missing dependencies. Will merge into the generator later.
svn path=/nixpkgs/trunk/; revision=7166
2006-11-28 22:28:27 +00:00
Eelco Dolstra ad897a7c96 * Update more URLs.
svn path=/nixpkgs/trunk/; revision=6713
2006-10-12 14:53:45 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 4c7b042e32 * Doh!
svn path=/nixpkgs/trunk/; revision=5521
2006-06-24 20:44:19 +00:00
Eelco Dolstra 829d0d96ca * X11R7.1 (I hope - the release is incomplete...).
svn path=/nixpkgs/trunk/; revision=5520
2006-06-24 20:31:10 +00:00
Martin Bravenboer 179e41fe9d Fix
svn path=/nixpkgs/trunk/; revision=5294
2006-05-11 08:28:03 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra 79b3528567 * OpenGL dependency in the i810 driver.
svn path=/nixpkgs/trunk/; revision=4571
2006-01-17 14:11:43 +00:00
Eelco Dolstra 57adf342b4 * Detect even more dependencies.
svn path=/nixpkgs/trunk/; revision=4568
2006-01-17 12:41:27 +00:00
Eelco Dolstra 43a679bab7 * More dependencies.
svn path=/nixpkgs/trunk/; revision=4562
2006-01-16 15:07:03 +00:00
Eelco Dolstra c656e18b1d * Don't build static libraries. Whooooosh!
svn path=/nixpkgs/trunk/; revision=4559
2006-01-16 12:59:34 +00:00
Eelco Dolstra b243aa0f12 * Even more zlib dependencies.
svn path=/nixpkgs/trunk/; revision=4558
2006-01-16 12:59:09 +00:00
Eelco Dolstra 830331445d * Some libraries need zlib.
svn path=/nixpkgs/trunk/; revision=4557
2006-01-16 12:46:20 +00:00
Eelco Dolstra 7dba8848ed * Fix a horrible in imake: its results depend on whether a C compiler
exists in one of a fixed set of paths (e.g., /usr/bin/cc).  For
  instance, on a system without /usr/bin/cc the variable DependCmd
  would evaluate to "makedepend", and on a system with it, to
  "gccmakedep".

  Solution: just use "gcc" always.  Also disabled some shitty code to
  detect the current Linux distribution (by probing for files like
  /etc/SuSE-release). 

svn path=/nixpkgs/trunk/; revision=4534
2006-01-11 00:21:52 +00:00
Eelco Dolstra 94517a614e * Export the input attributes.
svn path=/nixpkgs/trunk/; revision=4533
2006-01-09 21:39:47 +00:00
Eelco Dolstra 2346c0061b * Get imake to build again (xmkmf is gone).
svn path=/nixpkgs/trunk/; revision=4530
2006-01-09 19:34:26 +00:00
Eelco Dolstra ceb9b654ed * Discover dependencies on libXaw.
* Handle commas in *.pc files.

svn path=/nixpkgs/trunk/; revision=4525
2006-01-09 12:49:21 +00:00
Eelco Dolstra ebc93faa32 * Automatically propagate pkgconfig "Requires" fields so I don't have
to figure out the propagatedBuildInputs.

svn path=/nixpkgs/trunk/; revision=4521
2006-01-08 22:09:44 +00:00
Eelco Dolstra c45d0521bd * Produce the right name attribute.
svn path=/nixpkgs/trunk/; revision=4520
2006-01-08 21:19:56 +00:00
Eelco Dolstra 20d0e31cd0 * Start update to X11R7.0.
svn path=/nixpkgs/trunk/; revision=4519
2006-01-08 20:32:34 +00:00
Eelco Dolstra ea95a0509e * Start the switch to the new X libraries. It's still conditional:
set `useOldXLibs' to `false' in all-packages-generic.nix to use
  them.
* Added Xaw3d.
* Added Xaw3d support to Emacs.

svn path=/nixpkgs/trunk/; revision=4263
2005-11-12 17:05:51 +00:00
Eelco Dolstra e0a8574dc8 * Get the VESA driver to build.
svn path=/nixpkgs/trunk/; revision=4200
2005-11-03 14:10:57 +00:00
Eelco Dolstra 3f2c3a6066 * More fixes to get a basic X server running (keyboard, mouse, i810
graphics).

svn path=/nixpkgs/trunk/; revision=4198
2005-11-02 21:49:08 +00:00
Eelco Dolstra a21e96548a * Add missing dependencies to the modular X components. This is a
quick hack; the actual packages should be fixed instead.

svn path=/nixpkgs/trunk/; revision=4197
2005-11-02 20:59:25 +00:00
Eelco Dolstra 4e50d07bdf * Added the generated Nix expression for the modular X.org tree. It
contains derivations for the 279 packages in that tree.  (Biggest
  Nix expression ever!)

svn path=/nixpkgs/trunk/; revision=4193
2005-11-02 15:47:56 +00:00
Eelco Dolstra 6d04a1fae0 * A script to generate Nix expressions for the modular X.org tree.
svn path=/nixpkgs/trunk/; revision=4191
2005-11-02 15:34:48 +00:00