Commit graph

31 commits

Author SHA1 Message Date
Lluís Batlle i Rossell b45e219eec Making mesa build the DRI driver, required by the xorg server on the Fuloong2F
svn path=/nixpkgs/branches/stdenv-updates/; revision=23051
2010-08-09 07:42:43 +00:00
Lluís Batlle i Rossell 2595ec4f4b Disable DRI on xorg for the fuloong2f, as mesa does not include 'dri.pc' in that platform,
and the autodetection of DRI by the xorgserver configure script looks like it needs
an explicit "--disable-dri" to go on.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23045
2010-08-08 18:53:38 +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 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
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
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 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
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 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 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 1829882a24 svn path=/nixpkgs/branches/xorg-7.5/; revision=18042 2009-10-30 07:41:09 +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
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
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
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
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
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