Commit graph

314 commits

Author SHA1 Message Date
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
Florian Friesdorf
2a2ceace7f generate-expr-from-tarballs.pl support multiple versions
svn path=/nixpkgs/trunk/; revision=31183
2011-12-31 06:07:32 +00:00
Florian Friesdorf
f6090f6bba reproduced my previous manual changes through generation of default.nix
svn path=/nixpkgs/trunk/; revision=31182
2011-12-31 06:07:28 +00:00
Florian Friesdorf
cebb40f533 adjusted oder of *.list in generate-expr-from-tarballs.pl example
svn path=/nixpkgs/trunk/; revision=31181
2011-12-31 06:07:26 +00:00
Florian Friesdorf
e45921800c adjusted example generate-expr-from-tarballs.pl call to 7.6
svn path=/nixpkgs/trunk/; revision=31180
2011-12-31 06:07:23 +00:00
Florian Friesdorf
0bb20084b5 xorg: alphabetical extra.list
svn path=/nixpkgs/trunk/; revision=31179
2011-12-31 06:07:21 +00:00
Florian Friesdorf
c9b2b8a182 xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list
svn path=/nixpkgs/trunk/; revision=31178
2011-12-31 06:07:18 +00:00
Florian Friesdorf
e1556e64d7 xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6
svn path=/nixpkgs/trunk/; revision=31177
2011-12-31 06:07:15 +00:00
Florian Friesdorf
44ef26c896 xlsclients-1.1.2
svn path=/nixpkgs/trunk/; revision=31176
2011-12-31 04:30:46 +00:00
Florian Friesdorf
251d42d03f xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
this might break things but makes awesome-3.4.11 happy

svn path=/nixpkgs/trunk/; revision=31171
2011-12-31 04:05:50 +00:00
Alexander Tsamutali
0ed57e3f64 servers/x11/xorg/overrides.nix:
Added xproto to propagatedBuildInputs of libXext, because for ex.
  shape.h includes Xfuncproto.h.

svn path=/nixpkgs/trunk/; revision=29505
2011-09-26 22:24:22 +00:00
Shea Levy
8a3f40a088 Get libpciaccess to compile on darwin
The added patch uses the correct byte-conversion functions on Apple systems. The library compiles on darwin but is not yet tested.

svn path=/nixpkgs/trunk/; revision=28881
2011-08-29 18:58:59 +00:00
Eelco Dolstra
626b7cd9f4 * Fix the xvinfo build.
svn path=/nixpkgs/branches/kde-4.7/; revision=27955
2011-07-26 00:04:46 +00:00
Peter Simons
1b53d1f22d xorg: updated xf86-video-ati to version 6.14.2
svn path=/nixpkgs/trunk/; revision=27776
2011-07-14 12:22:49 +00:00
Michael Raskin
04d5aed6d0 Add intel driver prerelease
svn path=/nixpkgs/trunk/; revision=26418
2011-03-18 09:10:53 +00:00
Eelco Dolstra
5382f8e934 * xorg-server updated to 1.9.5.
svn path=/nixpkgs/trunk/; revision=26417
2011-03-18 09:07:46 +00:00
Michael Raskin
ee75c32a3b More needed propagations noted for future big update
svn path=/nixpkgs/trunk/; revision=26409
2011-03-18 05:32:14 +00:00
Michael Raskin
92a26c823c Comment about incomplete set of propagatedBuildInputs
svn path=/nixpkgs/trunk/; revision=26406
2011-03-17 22:00:22 +00:00
Michael Raskin
1d99933141 Fix xbacklight
svn path=/nixpkgs/trunk/; revision=26402
2011-03-17 18:46:25 +00:00
Michael Raskin
3fa36ea4a1 Fix TWM build
svn path=/nixpkgs/trunk/; revision=26399
2011-03-17 15:51:13 +00:00
Eelco Dolstra
6ba53ec09a * Fix xf86-input-synaptics and xf86-input-keyboard.
* Enable parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
2011-02-15 15:54:57 +00:00
Eelco Dolstra
a5aa96c3a3 * xorgserver: propagate dri2proto.
svn path=/nixpkgs/branches/x-updates/; revision=25980
2011-02-15 14:34:26 +00:00
Eelco Dolstra
1566609a1a * libXft: propagate libXrender.
svn path=/nixpkgs/branches/x-updates/; revision=25950
2011-02-14 10:14:34 +00:00
Eelco Dolstra
47aa6890d2 * libXaw: propagates libXmu.
svn path=/nixpkgs/branches/x-updates/; revision=25948
2011-02-14 10:04:37 +00:00
Eelco Dolstra
0f0d3f9543 * Fix xorg-server.
svn path=/nixpkgs/branches/x-updates/; revision=25907
2011-02-11 15:54:01 +00:00
Eelco Dolstra
337e26fea0 * xkbcomp 1.2.1.
svn path=/nixpkgs/branches/x-updates/; revision=25906
2011-02-11 15:32:08 +00:00
Eelco Dolstra
8ca86a8114 * Remove libX11 docs.
svn path=/nixpkgs/branches/x-updates/; revision=25855
2011-02-09 15:17:15 +00:00
Eelco Dolstra
6a59d1a98f * Latest Glib, ATK, Pango and GTK+.
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra
0b8efb0cbb * X.org 7.6.
svn path=/nixpkgs/branches/x-updates/; revision=25818
2011-02-08 17:39:28 +00:00
Michael Raskin
e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet
svn path=/nixpkgs/trunk/; revision=24714
2010-11-16 21:05:54 +00:00
Michael Raskin
fada13658f Fix xf86inputsynaptics
svn path=/nixpkgs/trunk/; revision=24274
2010-10-14 10:51:52 +00:00
Michael Raskin
8a191cddd8 Fix include paths for xf86inputsynaptics
svn path=/nixpkgs/trunk/; revision=24259
2010-10-13 11:43:59 +00:00
Eelco Dolstra
4788fc9298 * Some X.org updates.
svn path=/nixpkgs/trunk/; revision=24252
2010-10-12 21:52:57 +00:00
Eelco Dolstra
f3677bef0d * Synaptics driver 1.2.2.
svn path=/nixpkgs/trunk/; revision=23091
2010-08-10 14:06:03 +00:00
Eelco Dolstra
ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency.
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
2010-07-29 08:21:21 +00:00
Eelco Dolstra
e6ff6558d6 * xrandr 1.3.3.
svn path=/nixpkgs/branches/x-updates/; revision=22727
2010-07-25 09:14:12 +00:00
Eelco Dolstra
df7091a4a1 * libpciaccess 0.12.0.
svn path=/nixpkgs/branches/x-updates/; revision=22684
2010-07-21 11:29:26 +00:00
Eelco Dolstra
78a5abdf85 * Updated the X.org server to 1.8.2. Note that it no longer depends
on HAL but instead uses udev to autoconfigure input devices.  We'll
  have to update the NixOS X server module accordingly, I guess.  See
  https://fedoraproject.org/wiki/Input_device_configuration.
* Updated Mesa to 7.8.2.

svn path=/nixpkgs/branches/x-updates/; revision=22681
2010-07-20 19:24:21 +00:00
Eelco Dolstra
cb11b171d1 svn path=/nixpkgs/branches/x-updates/; revision=22671 2010-07-20 07:58:36 +00:00
Eelco Dolstra
5ebeb68c72 * Update the imake patch.
svn path=/nixpkgs/branches/x-updates/; revision=22660
2010-07-19 10:18:06 +00:00
Eelco Dolstra
0d225fb86a * Support *.pc.in files that are not in the top directory of the package.
svn path=/nixpkgs/branches/x-updates/; revision=22659
2010-07-19 08:59:05 +00:00
Eelco Dolstra
662600c241 * Updated various X.org packages, including libX11.
svn path=/nixpkgs/branches/x-updates/; revision=22632
2010-07-18 21:51:13 +00:00
Eelco Dolstra
26164c05c5 * lndir: work properly on directories with st_nlink set to 1 (such as
on btrfs).  (From David Brown.)

svn path=/nixpkgs/trunk/; revision=22619
2010-07-16 22:04:56 +00:00
Lluís Batlle i Rossell
93d2b4b7bf Updating the intel x11 video drivers.
(I know I modified an automatically generated file, but I don't imagine
well the consequences of this)

svn path=/nixpkgs/trunk/; revision=21248
2010-04-22 20:12:26 +00:00
Lluís Batlle i Rossell
8807722e17 Adding xdm
svn path=/nixpkgs/trunk/; revision=20947
2010-04-05 14:09:22 +00:00
Eelco Dolstra
04f73b29d6 * Force a rebuild of the X server, because the current build got
corrupted in a crash.

svn path=/nixpkgs/trunk/; revision=20497
2010-03-09 15:35:46 +00:00
Marc Weber
f57a5d2273 libXi: build man pages
svn path=/nixpkgs/trunk/; revision=20089
2010-02-18 01:49:53 +00:00
Eelco Dolstra
b1fb08569f * X.org server updated to 1.7.5.
svn path=/nixpkgs/trunk/; revision=20050
2010-02-16 13:34:30 +00:00
Lluís Batlle i Rossell
d47aead668 Setting the difference buildInputs/buildNativeInputs in some gtk related packages.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
2010-01-22 18:49:16 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Eelco Dolstra
78718b5a3d * xorg-server updated to 1.7.4, along with some other X.org packages.
svn path=/nixpkgs/trunk/; revision=19387
2010-01-13 11:51:45 +00:00
Eelco Dolstra
3535899507 * Added xinit.
svn path=/nixpkgs/trunk/; revision=19236
2010-01-05 14:49:23 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Peter Simons
d21a4d14fc pkgs/servers/x11/xorg/overrides.nix: dropped override for libXaw on Darwin
With the latest version of libXaw, those patches aren't necessary
anymore; the build has been fixed upstream.

svn path=/nixpkgs/trunk/; revision=18856
2009-12-09 15:56:20 +00:00
Eelco Dolstra
bf7a38f3ff * X.org server 1.7.3.
svn path=/nixpkgs/trunk/; revision=18792
2009-12-03 15:51:40 +00:00
Lluís Batlle i Rossell
a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Lluís Batlle i Rossell
b4e31ce1bf fixing the name in the openchrome expression.
svn path=/nixpkgs/trunk/; revision=18573
2009-11-23 21:40:26 +00:00
Lluís Batlle i Rossell
d8aa5b5db1 Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build
inputs did not get in)
Updating the xorg builder script to support cross building (in fact, support
for propagating the required build inputs).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18569
2009-11-23 19:45:18 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
d0d2c6e3fe Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
2009-11-21 14:49:25 +00:00
Lluís Batlle i Rossell
ca5d91aa60 Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib...
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.

I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
2009-11-21 10:44:22 +00:00
Lluís Batlle i Rossell
3136303d63 Fixing the libxcb native build: missing dependency.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18499
2009-11-21 10:11:44 +00:00
Lluís Batlle i Rossell
4acd0bdb8c Making xorgserver build also Xnest.
svn path=/nixpkgs/trunk/; revision=18395
2009-11-17 16:46:51 +00:00
Lluís Batlle i Rossell
c28701c3d9 Fixing the xdriinfo build.
svn path=/nixpkgs/trunk/; revision=18287
2009-11-08 11:34:17 +00:00
Lluís Batlle i Rossell
b02ba2aff8 Updating the xorg dri path patch for dri2.
svn path=/nixpkgs/trunk/; revision=18225
2009-11-06 21:15:59 +00:00
Lluís Batlle i Rossell
bbcd6e2728 Fixing the url for the xorg video unichrome driver.
prefetching and then realising the expression does not test the url,
I've to keep that in mind.

svn path=/nixpkgs/trunk/; revision=18222
2009-11-06 19:26:00 +00:00
Lluís Batlle i Rossell
9240b56a61 Fixing fonts.alias in the new xorg, and adding a check for the next time
they change the fonts.alias path.

svn path=/nixpkgs/trunk/; revision=18210
2009-11-06 15:16:47 +00:00
Lluís Batlle i Rossell
91c8df91bf Adding the Unichrome xorg video driver, and updating the Openchrome.
svn path=/nixpkgs/trunk/; revision=18161
2009-11-05 21:34:31 +00:00
Eelco Dolstra
9a4cd33d10 * Fix the synaptics driver.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18115
2009-11-04 19:53:23 +00:00
Eelco Dolstra
b98502f06a * Fix xf86inputsynaptics.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18085
2009-11-03 23:54:08 +00:00
Eelco Dolstra
390548d708 * Fix the font packages. They need a --with-fontrootdir flag now.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18043
2009-10-30 08:20:03 +00:00
Eelco Dolstra
1829882a24 svn path=/nixpkgs/branches/xorg-7.5/; revision=18042 2009-10-30 07:41:09 +00:00
Eelco Dolstra
05ff927d83 * Bring back libXxf86misc and xf86miscproto. These were removed from
X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
2009-10-29 18:25:53 +00:00
Eelco Dolstra
28d718aceb * X.org 7.5.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18034
2009-10-29 17:56:10 +00:00
Lluís Batlle i Rossell
9d71e990a1 Updating the openchrome xorg video driver
svn path=/nixpkgs/trunk/; revision=17743
2009-10-11 14:41:31 +00:00
Peter Simons
b9b57c6149 Move libXaw fix from default.nix to overrides.nix.
svn path=/nixpkgs/trunk/; revision=17620
2009-10-02 18:03:23 +00:00
Peter Simons
1570ccf3cf libXaw: fixed broken installation in MacOS X
See comments in file for further details.

svn path=/nixpkgs/trunk/; revision=17609
2009-10-02 13:57:21 +00:00
Eelco Dolstra
317fd0edd5 * Revert the manual changes to default.nix
* Build libSM with the system libuuid on Darwin (in such a way that we
  don't get a rebuild on all other platforms).

svn path=/nixpkgs/trunk/; revision=17606
2009-10-02 13:06:35 +00:00
Peter Simons
f2c6df33ba pkgs/servers/x11/xorg/default.nix: strip trailing white-space
svn path=/nixpkgs/trunk/; revision=17601
2009-10-02 12:45:04 +00:00
Peter Simons
abe32ecf99 libSM: use native libuuid when building on MacOS X
On Linux, <uuid/uuid.h> and related functions are provided by the util-linux-ng
package, which doesn't build on other operating systems, such as MacOS X. That
platform provides libuuid as part of the system. Hence, to build libSM on
MacOS, we define (empty) variables LIBUUID_CFLAGS and LIBUUID_CFLAGS. Those
settings disable ./configure's attempt to detect libuuid with pkgconfig --
which would fail.

svn path=/nixpkgs/trunk/; revision=17600
2009-10-02 12:44:59 +00:00
Eelco Dolstra
9d15693163 * Make sure that the X server can write the compiled xkb keymap. This
requires $out/share/X11/xkb/compiled to be writable, so symlink it
  to /var/tmp.  Using --with-xkb-output doesn't work in a chroot build
  because `make install' tries to write a README.compiled file to
  /var/tmp, which doesn't exist in the chroot.

svn path=/nixpkgs/trunk/; revision=17000
2009-09-09 22:16:09 +00:00
Eelco Dolstra
ced7a48e5d * glx: make the XORG_DRI_DRIVER_PATH environment variable work for the
software renderer as well.

svn path=/nixpkgs/trunk/; revision=16943
2009-09-02 22:32:56 +00:00
Lluís Batlle i Rossell
116c1e4bdd Adding the proper derivation name to the openchrome xorg driver override.
svn path=/nixpkgs/trunk/; revision=16781
2009-08-19 20:19:33 +00:00
Lluís Batlle i Rossell
dab4dc0de1 Using openchrome trunk instead of that distributed with xorg. That
doesn't work in K8N800, and trunk even does a bit of 3D by hw.

svn path=/nixpkgs/trunk/; revision=16329
2009-07-11 10:32:27 +00:00
Eelco Dolstra
645c91708f * Updated some drivers.
svn path=/nixpkgs/trunk/; revision=16002
2009-06-18 17:20:01 +00:00
Eelco Dolstra
85978b1efa * e2fsprogs updated to 1.41.6. Also keep the previous version around
so that we don't have to rebuild everything that depends on libuuid
  (such as all X programs).

svn path=/nixpkgs/trunk/; revision=15964
2009-06-15 16:45:48 +00:00
Michael Raskin
4fb36441e2 Override xf86videoati version and make xkbcomp work from inside X server
svn path=/nixpkgs/trunk/; revision=15450
2009-05-05 12:38:04 +00:00
Lluís Batlle i Rossell
7e53d1062f Adding mesa to compile the openchrome driver.
svn path=/nixpkgs/trunk/; revision=15386
2009-04-28 22:15:44 +00:00
Eelco Dolstra
c718ec217b * X.org generator: specify overrides in a Nix expression rather than
in the generator script.  This makes it easier to change the X.org
  packages.
* Added xfs, twm.

svn path=/nixpkgs/trunk/; revision=15375
2009-04-28 13:58:35 +00:00
Lluís Batlle i Rossell
44f19bc1b4 Making the latest xorg cope well with xkbcomp.
svn path=/nixpkgs/trunk/; revision=15347
2009-04-28 08:05:28 +00:00
Eelco Dolstra
5f9014cc7f * Updated evdev to the latest version. Otherwise, the arrow keys and
others break under KDE and Gnome unless you set the keyboard type to
  evdev (e.g. in the KDE System Settings).  See
  
    http://wiki.archlinux.org/index.php/Xorg_input_hotplugging#Using_the_evdev_driver_kills_my_arrow_keys.2C_printscreen_is_triggered_instead

  TODO: update this in the X.org generator.

svn path=/nixpkgs/trunk/; revision=15343
2009-04-27 23:06:02 +00:00
Marc Weber
3c05ea1a4b readding and updating xorg.xfs. It's required to run tightvnc
1.0.8 is latest version

svn path=/nixpkgs/trunk/; revision=15329
2009-04-27 01:44:30 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra
0296fabb9e * Added dri2proto to the list of tarballs and reran
the generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15201
2009-04-20 21:59:42 +00:00
Lluís Batlle i Rossell
15f1feb702 Fixing mesa and xorgserver
svn path=/nixpkgs/branches/stdenv-updates/; revision=15199
2009-04-20 18:46:32 +00:00
Eelco Dolstra
8f12b8abf9 * Fixed libXext; it needs newer headers.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15197
2009-04-20 18:09:37 +00:00
Eelco Dolstra
077b0157a0 * Updated the generator to handle some missing dependencies.
Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
2009-04-20 16:02:50 +00:00
Eelco Dolstra
406cacbb87 * printproto has a dependency on libXau which our generator
doesn't see for some reason.  Will have to fix the 
  generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15187
2009-04-20 14:37:05 +00:00
Eelco Dolstra
c584bb878a * Sync with trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
2009-01-29 16:33:02 +00:00
Ludovic Courtès
05e01abc75 Xorg Pixman 0.13.2.
svn path=/nixpkgs/trunk/; revision=13834
2009-01-24 21:29:57 +00:00
Eelco Dolstra
c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Peter Simons
6fb297513a Committing Lluís Batlle's submissions from mailing list posting
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
2009-01-12 21:12:07 +00:00
Eelco Dolstra
e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00
Eelco Dolstra
964b969066 * Remove ... for now.
svn path=/nixpkgs/trunk/; revision=13143
2008-10-29 09:42:11 +00:00
Michael Raskin
8c3f202c09 Made it easy to build custom xf86videoati version
svn path=/nixpkgs/trunk/; revision=13112
2008-10-25 07:19:07 +00:00
Michael Raskin
b38742e0c2 Adding a more stable X.org ati driver version (more stable for dualview)
svn path=/nixpkgs/trunk/; revision=13108
2008-10-24 05:13:23 +00:00
Eelco Dolstra
c9c2045610 * Cairo: build with XCB support.
* Fixed libXp.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13069
2008-10-14 14:46:56 +00:00
Eelco Dolstra
dbc0d399bf * Add some more packages that have been apparently deprecated from X.org.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13043
2008-10-10 08:55:45 +00:00
Eelco Dolstra
0e68610feb * libXp has been removed from X.org 7.4 but some packages still need it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13032
2008-10-09 16:24:51 +00:00
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