Commit graph

53 commits

Author SHA1 Message Date
Bjørn Forsman
a5b68eb4f6 xorg: add meta.platforms
Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.
2015-12-30 12:50:54 +01:00
Vladimír Čunát
2755d2b241 xorg: adjust generator to work with other archive types
In the end I didn't utilize it, but it shouldn't hurt.
2015-10-19 10:08:16 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Sebastián Bernardo Galkin
06e6d7def2 xorg-server: enable DRI3 (close #5381)
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.
2014-12-18 18:17:42 +01:00
Charles Strahan
5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Eelco Dolstra
935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +02:00
Vladimír Čunát
619b024600 X security updates
http://www.x.org/wiki/Development/Security/Advisory-2013-05-23

Three libs not released yet and without commit activity for around two
weeks, so I took the current master heads.
2013-06-05 21:24:19 +02:00
Eelco Dolstra
3b968053d4 Fix font-schumacher-misc build
http://hydra.nixos.org/build/3157818
2012-10-15 11:52:11 -04: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
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
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
Eelco Dolstra
0b8efb0cbb * X.org 7.6.
svn path=/nixpkgs/branches/x-updates/; revision=25818
2011-02-08 17:39:28 +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
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
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
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
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
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
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
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
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
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
Eelco Dolstra
b7f1b56b18 * X11R7.3.
svn path=/nixpkgs/trunk/; revision=9592
2007-11-05 23:59:55 +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
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
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
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
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
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