Vladimír Čunát
556a28908e
Merge: xorg and gtk-related updates
2016-01-05 09:53:01 +01:00
Vladimír Čunát
16d0cd7c68
xorg: update tarballs list
...
There've been some updates of default.nix without corresponding updates
in the tarball list. Re-generation then added lots of downgrade cruft.
The intel driver can't be added this way, but at least we get much closer.
2016-01-04 12:03:37 +01:00
Vladimír Čunát
62bb0329ae
xorg.xf86*{libinput,nouveau}: minor driver updates
2016-01-04 12:00:28 +01:00
Vladimír Čunát
cba685ba45
xorg.xorgcffiles: update 1.0.5 -> 1.0.6 (probably unused)
2016-01-04 11:58:30 +01:00
Vladimír Čunát
9714056914
xorg: small but mass-rebuild updates
2016-01-04 11:57:11 +01:00
Vladimír Čunát
a6812c1ca5
xorg.xf86videorendition: init at 4.2.6
2016-01-04 11:54:10 +01:00
Vladimír Čunát
88dff78662
xorg.libXfont2: init at 2.0.1
2016-01-04 11:52:51 +01:00
Vladimír Čunát
b559020e27
xorgReplacements: remove this ancient cruft
2016-01-04 10:31:58 +01:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
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
Jude Taylor
848064cef6
remove old patches and attributes from xorgserver
2015-12-16 12:03:29 -08:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
baf30718ca
Merge branch 'master.upstream' into staging.upstream
2015-11-18 02:36:33 -08:00
William A. Kennington III
f9f3b47c72
xkbcomp: 1.3.0 -> 1.3.1
2015-11-18 02:36:18 -08:00
William A. Kennington III
4da7935a8e
xinput: 1.6.1 -> 1.6.2
2015-11-18 02:36:18 -08:00
William A. Kennington III
b52f2f6401
xorg-server: 1.18.0 -> 1.17.4
...
There were lots of issues with the proprietary nvidia driver on 352.63
and we don't yet have a proprietary AMD driver.
2015-11-18 02:34:26 -08:00
William A. Kennington III
ee153a619a
xorg: Fix hashes
2015-11-17 21:25:15 -08:00
William A. Kennington III
2e595e32f6
xf86-video-ati: 7.5.0 -> 7.6.1
2015-11-17 21:15:30 -08:00
William A. Kennington III
2792b9228c
xf86-input-synaptics: 1.8.2 -> 1.8.3
2015-11-17 21:15:04 -08:00
William A. Kennington III
7a2283b08e
xf86-input-libinput: 0.14.0 -> 0.15.0
2015-11-17 21:14:46 -08:00
William A. Kennington III
5b3bbd1ac1
xf86-input-evdev: 2.9.2 -> 2.10.0
2015-11-17 21:14:18 -08:00
William A. Kennington III
020f6cfadc
xorg-server: 1.17.2 -> 1.18.0
2015-11-17 21:11:53 -08:00
aszlig
d81fc427da
xf86-video-intel: 2015-11-13 -> 2015-11-14
...
Fixes quite an annoying and reproducable memory leak when I was using
multiple heads. This is the fix in question:
http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=2d26643cab33a32847afaf13b50d326d09d58bf7
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 14:46:52 +01:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
William A. Kennington III
64f31fbc35
xf86-video-intel: 2015-11-10 -> 2015-11-13
2015-11-13 10:37:27 -08:00
William A. Kennington III
bf985091d5
xf86-video-intel: 2015-07-22 -> 2015-11-10
2015-11-10 18:27:46 -08:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Lluís Batlle i Rossell
61c6597246
Bringing back eo symbols for xkb
...
I port the patch for esperanto symbols removed in
1be2acd131
to the current
xkeyboardconfig.
(cherry picked from commit 4a830de0323e34592a36dea660d9a3ec8348964e)
2015-10-29 13:32:35 +01:00
Jude Taylor
c749714170
clean up xquartz arguments
2015-10-28 13:56:13 -07:00
Vladimír Čunát
787f322540
$docdev fixups: mostly to avoid empty output
...
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Vladimír Čunát
e153b68fce
xorg-server: avoid runtime references to xorgserver-dev
2015-10-28 10:22:58 +01:00
Tuomas Tynkkynen
db81e22148
treewide: Mass-replace 'xorgserver}/bin' with correct output
...
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
Tuomas Tynkkynen
c7e3ee4153
libXvMC: Split into multiple outputs
2015-10-28 10:17:11 +01:00
Vladimír Čunát
06eba7d320
xorg: remove $man where it was only man3
...
Now man3 is deleted if not specified otherwise,
and I don't really see a reason for X libs to produce them.
(This fixes failures due to not producing $man outputs.)
The $doc outputs are also development docs (all probably),
but I left those for now.
2015-10-28 10:17:07 +01:00
Jude Taylor
5469e9c581
fix xquartz build
2015-10-26 18:37:05 -07:00
Jude Taylor
cf12f3e4d2
patch out system include in libAppleWM
2015-10-26 17:13:29 -07:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02: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
Vladimír Čunát
b6059b2c6a
xorg: add three missing video drivers - chips, s3virge, xgi
...
Only building was tested.
2015-10-19 10:06:48 +02:00
Vladimír Čunát
ff94673659
xorg.xf86-video-sis: minor update 0.10.7 -> 0.10.8
2015-10-19 09:39:32 +02:00
Vladimír Čunát
801a843bdb
xorg.xorg-server: use the generated expression
...
... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.
2015-10-19 09:35:07 +02:00
Vladimír Čunát
15f27723b3
xorg.xf86-input-libinput: update 0.12.0 -> 0.14.0
2015-10-19 09:20:13 +02:00
Robert Irelan
678c81b74d
xorg.xf86-video-ast: 0.98.0 -> 1.1.5 ( close #10451 )
...
Fix failure of 0.98.0 to compile with NixOS 15.09 (due to referencing a
symbol `IOADDRESS` that has been removed from X.org drivers).
2015-10-19 09:06:33 +02:00
Vladimír Čunát
e25da7e5c8
xorg: split outputs of various libs
2015-10-14 14:27:07 +02:00
Vladimír Čunát
fa6ddd7fa6
xorg.{libICE,libSM}: split dev and doc outputs
2015-10-13 20:19:01 +02:00
Vladimír Čunát
783c40eb68
dbus: split into multiple outputs and fix referrers
2015-10-13 20:19:01 +02:00
Vladimír Čunát
47305626ab
xorg{xcb-util-keysyms,libxkbfile}: split the dev output
2015-10-13 20:18:59 +02:00
Vladimír Čunát
e4f38fb050
xorg.xcb-util: split into multiple outputs
...
I see no references likely to break.
2015-10-05 16:00:55 +02:00
Vladimír Čunát
32b31398eb
xorg.libXt: re-split into multiple outputs
...
Fixed all 'libXt}' references, too.
2015-10-05 11:23:34 +02:00
Tuomas Tynkkynen
753cfbe09b
libXmu: Split into multiple outputs
...
We need to override BITMAPDIR, since the default:
-DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
would cause cycles between the outputs. Setting it to a nonexistent path
doesn't affect the code logic, since the corresponding single-output
directory $out/include/X11/bitmaps doesn't exist either.
(cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e)
2015-10-03 16:36:21 +02:00
Tuomas Tynkkynen
0100b27069
imake: Add uberhack to workaround broken 'gcc -x c'
...
Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)
What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
2015-10-03 14:08:51 +02:00
Tuomas Tynkkynen
947542be6d
libxft: Fix reference to incorrect output
2015-10-03 14:08:50 +02:00
Tuomas Tynkkynen
f72376fd20
x11: Remove conflicting outputs produced by auto merge
2015-10-03 13:39:33 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Jude Taylor
4f9ef9bbfb
give xquartz impure deps to make it build
2015-09-28 14:45:45 -07:00
Jude Taylor
76a6539829
work on making xquartz buildable in a pure environment
2015-09-22 16:27:51 -07:00
Jude Taylor
d78936131a
preparation for being able to build xquartz
2015-09-17 16:11:18 -07:00
William A. Kennington III
8dc7073546
Merge branch 'master.upstream' into staging.upstream
2015-09-15 12:04:41 -07:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
Benjamin Saunders
a6f6c0eeeb
libxcb: add xinput support ( close #9835 )
2015-09-13 10:51:21 +02:00
Vladimír Čunát
8ab4c20998
xorg.{libXi,libxcb}: maintenance update
2015-09-13 10:51:21 +02:00
Domen Kožar
66214fba8d
Xorg: apply patch to fix X crashes
...
(cherry picked from commit dc0fe8ebf40b7724de1ca0b195236854591fdb5f)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-04 18:47:40 +02:00
Tuomas Tynkkynen
6b866a37fc
xrdb: Use mcpp as the preprocessor
...
Close #9501 , fixes #9480 .
By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).
Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
2015-08-29 08:29:59 +02:00
William A. Kennington III
2ac70270e8
Merge branch 'master.upstream' into staging.upstream
2015-08-18 11:36:32 -07:00
Max Zerzouri
807a0e4609
xorg-server: fix XKB_BINDIR usage ( close #8993 )
...
Previously, XKB_BINDIR was read inside a loop over the program
arguments, so was only read if it had arguments that weren't matched by
the first some number of checks.
2015-08-18 10:14:11 +02:00
Charles Strahan
f178817aee
xquartz: 1.14.6 -> 1.17.2
...
closes #9126
2015-08-05 13:57:02 -05:00
William A. Kennington III
09b4a7cc1b
Merge branch 'master.upstream' into staging.upstream
2015-07-31 17:26:20 -07:00
John Wiegley
23562aad59
Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9"
...
This reverts commit 5c896e5511
, which was
a set of local changes unrelated to the commit title.
2015-07-30 16:21:39 -07:00
William A. Kennington III
aaef42ab8c
Merge branch 'master.upstream' into staging.upstream
2015-07-29 10:23:08 -07:00
John Wiegley
5c896e5511
emacs: Update Mac Port Emacs to 24.5-mac-5.9
2015-07-28 20:08:53 -07:00
Vladimír Čunát
2600e00ca9
xorg.xproto: maintenance update
2015-07-28 19:13:50 +02:00
Eelco Dolstra
e1f78bf677
More docs/manpages in separate outputs
2015-07-27 00:27:54 +02:00
Vladimír Čunát
a2f16fdcff
Merge branch 'staging'
2015-07-24 15:12:28 +02:00
William A. Kennington III
d8991a7b3b
xf86-video-intel: 2.99.917 -> 2015-07-22
2015-07-22 13:14:27 -07:00
Vladimír Čunát
1be2acd131
xkeyboard-config: updates
...
Also drop Esperanto patch for now, as it doesn't apply anymore
and there are some Esperanto variants inside. Discussed:
https://github.com/NixOS/nixpkgs/commit/fa5a583098
2015-07-19 13:33:04 +02:00
Vladimír Čunát
00dfcfb76a
xorg: driver updates
...
Also fixup tarball list after e4316b8c17
,
and drop a patch integrated in the update.
2015-07-19 13:33:03 +02:00
Vladimír Čunát
e6ca18e9bf
xwayland: fix build
...
Maybe it was just covered by #7524 until now.
/cc #5061 and @echo-oddly.
2015-06-27 11:40:04 +02:00
William A. Kennington III
8e19ac8d7c
Merge branch 'master.upstream' into staging.upstream
2015-06-17 11:57:40 -07:00
William A. Kennington III
8310045b14
Add missing patch
2015-06-16 23:56:15 -07:00
William A. Kennington III
061887e38a
xf86-video-intel: Kernel 4.0 match
2015-06-16 23:37:05 -07:00
William A. Kennington III
e4316b8c17
xorg-server: 1.16.4 -> 1.17.2
2015-06-16 23:36:11 -07:00
William A. Kennington III
57ee8d6131
xorgserver: Add gcc5 compat patch
2015-06-16 14:21:54 -07:00
Eelco Dolstra
553abf71ba
Merge remote-tracking branch 'origin/staging' into gcc-4.9
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/libraries/wayland/default.nix
pkgs/development/tools/build-managers/cmake/default.nix
pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Vladimír Čunát
edeab75913
xcompmgr: generate along with xorg stuff
...
Also a minor update.
/cc maintainer @astsmtl.
2015-05-26 20:06:53 +02:00
Vladimír Čunát
0e270def52
xorg.x11perf: larger update
...
Seems to run fine.
2015-05-26 20:06:52 +02:00
Vladimír Čunát
471a2a7ee7
xorg {xorg-docs,kbproto}: minor updates
2015-05-26 20:06:52 +02:00
Vladimír Čunát
e5fa9ab0fd
xlsfonts: generate along with xorg stuff
...
Also a minor update.
/cc maintainer @viric.
2015-05-26 20:06:51 +02:00
Vladimír Čunát
688b4ca5db
xorg: add xmag and xgc apps
...
Tested very briefly.
2015-05-26 20:06:51 +02:00
Vladimír Čunát
1a13909173
xorg: minor updates of apps
2015-05-26 20:06:50 +02:00
Vladimír Čunát
6bddcbda8a
xorg: maintenance updates of libs
2015-05-26 20:06:50 +02:00
Vladimír Čunát
3287103b00
xorg: add libXpresent and xcb-util-errors
2015-05-26 20:06:48 +02:00
Vladimír Čunát
34c9d898da
xorg: update randr
2015-05-24 23:28:41 +02:00
Vladimír Čunát
3c5b83262b
xorg: update cirrus and libinput drivers
2015-05-24 23:26:07 +02:00
Vladimír Čunát
3115d18c53
xorg: update drivers that seem useless
2015-05-24 23:10:52 +02:00
Eelco Dolstra
e8e0995bd0
Fix inputproto and probably other packages
...
"grep Requires" failed on *.pc files that had no Requires fields, due
to pipefail. But this error was previously masked by #7524 .
2015-05-13 18:17:25 +02:00
Eric Seidel
662a6b1ca6
remove all references to stdenv.cc.cc.is{GNU,Clang}
...
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Vladimír Čunát
3dba642c33
xorg: add xf86-input-libinput and xf86-video-i740
2015-04-18 07:11:55 +02:00
Vladimír Čunát
4b6b03e2ce
xcb-util-cursor: autogenerate as other xorg pkgs
...
HEAD version still needed on darwin, reportedly:
https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
2015-04-18 07:08:45 +02:00
Vladimír Čunát
4f0dae99f9
xorg misc maintenance updates
2015-04-18 07:08:16 +02:00
Vladimír Čunát
e7aec13bda
xorg libs: maintenance updates
2015-04-18 07:08:16 +02:00
Vladimír Čunát
6087b3d16c
xorg drivers: minor updates
2015-04-18 07:08:15 +02:00
Nikita Mikhailov
a29182a6f5
xorg: fix Xephyr
2015-04-11 11:34:35 +02:00
Eric Seidel
13dae62ec2
libxkbfile: patch for clang36
2015-03-24 20:54:47 -07:00
Vladimír Čunát
6a230188c6
xorg.libXfont: security update
...
Fixes CVE-2015-{1802,1803,1804}.
http://lists.x.org/archives/xorg-announce/2015-March/002550.html
Almost nothing needs rebuilding.
2015-03-17 18:36:52 +01:00
Nikolay Amiantov
edaa3a7643
xorg-server: add Xephyr ( close #6715 )
2015-03-12 20:15:21 +01:00
aszlig
0ccf34039c
xorg.mxfontscale: Fix segfault with some fonts.
...
The update to version 1.1.2 in 9c22c1b
introduces a segfault when
mkfontscale is processing fonts where the family name is missing.
Applies a patch from Stefan Dirsch <sndirsch@suse.com> to be found at:
https://bugs.freedesktop.org/show_bug.cgi?id=89409
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-11 16:57:21 +01:00
Vladimír Čunát
6c20e1d0bd
xf86-video-vmware: drop patch included in update
2015-03-09 15:55:28 +01:00
Vladimír Čunát
a3e0ee10e5
xf86-video-vmware: update
2015-03-09 15:55:23 +01:00
Vladimír Čunát
9c22c1b3d7
xorg: update various modules
2015-03-09 15:55:23 +01:00
Alexander V. Nikolaev
279d5af119
Proper default path for XKB config files
2015-02-24 21:38:30 +02:00
Vladimír Čunát
cf1550cbbf
xorg-server: security+bugfix, including CVE-2015-0255
...
Tested briefly against 14.12.
2015-02-12 20:15:16 +01:00
Vladimír Čunát
1982ac0b65
xorg.xinit: fix on Linux after #6160
2015-02-05 11:09:14 +01:00
Eric Seidel
7f7482b6bd
fix xorgserver / xquartz on darwin
2015-02-04 15:14:36 -08:00
Shea Levy
df430ab2ea
Fix imake on darwin.
...
Taken from joelteon/nixpkgs@6b3f7e6fb0
Original author Mike Sperber <sperber@deinprogramm.de>
2015-02-04 10:00:50 +00:00
Vladimír Čunát
0bc5228fd2
xorg.xf86-video-intel: maintenance update
2014-12-25 10:06:49 +01:00
Vladimír Čunát
081e5c8387
Merge #5061 : add xwayland
...
Also resolve minor nitpicks -- *during* the merge commit.
2014-12-25 09:25:05 +01: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
Vladimír Čunát
84d6debf46
xorg-server: security update to RC1 of 1.16.3
...
Close #5292 . There are almost no other changes since 1.16.2
than fixing that CVE-2014-8092. See also:
http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/
2014-12-16 19:28:42 +01:00
Vladimír Čunát
ea557c8fd1
xorg xf86-input-evdev: update and add needed inputs
2014-12-03 13:26:32 +01:00
Vladimír Čunát
ea1dd9fd4a
xorg: revert to older xf86-input-evdev for now
...
How could I forget to test to build it at least :-/
2014-11-28 22:04:39 +01:00
Vladimír Čunát
442cad9cbd
xorg: update some modules
2014-11-28 20:42:07 +01:00
David Virgilio
9a2b2e7b34
new package: xwayland
2014-11-20 06:21:47 -06:00
Eelco Dolstra
a0f3faf34e
Merge remote-tracking branch 'origin/glibc-2.20' into staging
2014-11-16 22:17:36 +01:00
Vladimír Čunát
4a62542f55
xorg.xf86-video-intel: use the new versions
...
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.
(cherry picked from commit 515dcb0f66
)
because the old driver won't compile with new X server.
2014-11-12 16:33:20 +01:00
Eelco Dolstra
0518ccf5af
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
dcd2590c98
xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps)
2014-11-05 07:55:25 +01:00
Eelco Dolstra
7495c61d49
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
...
Conflicts:
pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Vladimír Čunát
515dcb0f66
xorg.xf86-video-intel: use the new versions
...
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.
2014-11-01 23:38:06 +01:00
Vladimír Čunát
95b475da09
xorg.xf86-input-vmmouse: fix build with glibc-2.20
2014-11-01 23:26:44 +01:00
Vladimír Čunát
4cc61d6d08
xorg.xf86-video-vmware: fix build against glibc-2.20
2014-11-01 22:29:42 +01:00
Vladimír Čunát
9877fdb39d
xorg: updates some modules; mostly minor changes
2014-10-19 20:10:19 +02:00
Joel Taylor
afa1db198b
fix even more clang builds
2014-09-09 13:54:57 -07:00
Joel Taylor
374648deaa
X11 build purity
2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334
suitable clang stdenv
2014-09-09 13:54:24 -07:00
Vladimír Čunát
8da52a642a
Merge branch 'staging' into v/modular
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
4c3e6a4675
xorg: go back to using the new nix syntax
...
This reverts commit 86a372683a
.
The original revert was just temporary.
Conflicts (auto-solved):
pkgs/servers/x11/xorg/default.nix
2014-08-31 12:20:34 +02:00
Vladimír Čunát
e51f73652d
Merge recent master into staging
...
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Vladimír Čunát
a70180ba73
mutiout: make it builtin
2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43
WIP: getting good
2014-08-27 01:14:09 +02:00
Vladimír Čunát
0f6ae6403e
xorg: fix typo from the last xorg commit
...
Thanks to @falsifian for noticing it.
2014-08-24 09:55:22 +02:00
Vladimír Čunát
99e300c4f8
xorg: add xf86-video-qxl
2014-08-23 18:55:30 +02:00
Vladimír Čunát
8c8197dfb3
xorg: stop using the new nix syntax
...
Partial revert of 5ea8497933
.
2014-08-23 16:15:28 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát
59e3e06076
xorg: update probably unused modules
2014-08-21 15:13:22 +02:00
Vladimír Čunát
acf8919844
xorg.xrandr: minor bugfix update
2014-08-21 15:13:21 +02:00
Vladimír Čunát
c31c79f0dd
xorg.xcb (lib+proto): update (seems mainly bug fixes)
2014-08-21 15:13:21 +02:00
Charles Strahan
6f2bd70fd0
Remove old comment, and delete confusing LaunchDaemon
2014-08-18 11:36:34 -04:00
Charles Strahan
5ea8497933
get xorg/x11 working on Darwin
2014-08-12 20:40:57 -04:00
Vladimír Čunát
91b53aaebc
xorg.libXext: minor update
2014-08-02 04:43:19 +02:00
Vladimír Čunát
f456abacb7
xorg.libXi: bugfix update
2014-07-20 08:38:06 +02:00
Vladimír Čunát
edec3719a6
xorg: update a few modules
2014-07-13 21:35:25 +02:00
Vladimír Čunát
dfd80a1b7e
Merge recent master into x-updates
...
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát
3f15312b44
xorg: add xkbprint
...
Suggested by @KoviRobi on ML.
2014-06-22 10:04:10 +02:00
Vladimír Čunát
c50f0e47e1
freetype: major update, including some CVE security
...
- There's no fontconfig update yet, as I failed to debug it yet.
- Infinality patches are now taken from a different (maintained) source.
2014-06-17 09:00:29 +02:00
Vladimír Čunát
ff327554e9
xorg: maintenance updates of several modules
2014-06-17 09:00:29 +02:00
Vladimír Čunát
bd96a4bb43
xorg: maintenance updates of a few modules
2014-05-26 22:45:50 +02:00
Vladimír Čunát
137eae0b55
Merge #2630 : add and use fetchpatch
...
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.
Conflicts (auto-solved):
pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
Vladimír Čunát
832c661822
xorg.libXfont: security update, CVE-2014-{0209,0210,0211}
...
For details see http://lists.x.org/archives/xorg-announce/2014-May/002431.html
2014-05-16 18:33:24 +02:00
Vladimír Čunát
6da5d7922d
xorg: minor update of xf86-input-{evdev,synaptics}
2014-05-06 18:43:01 +02:00
Vladimír Čunát
9e9f282309
xorg-server: go back to 1.14.6 due to intel problems
...
Again, stable releases not compiling together :-/
2014-04-19 23:42:54 +02:00
Vladimír Čunát
5d850ba9d3
xorg: revert fontsproto update, as it breaks libXfont
...
This partially reverts commit 30ac332563
.
https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ
It's sad that the currently *released* versions don't even compile together,
and no dev reacts for four days so far...
2014-04-19 22:15:32 +02:00
Vladimír Čunát
f66e5664e0
xorg-server: major update 1.14.5 -> 1.15.1
2014-04-19 14:31:14 +02:00
Vladimír Čunát
30ac332563
xorg: minor updates of three packages
2014-04-19 14:30:48 +02:00
Vladimír Čunát
44f4862041
xorg.xtrans: maintenance update
2014-04-01 10:53:34 +02:00
Vladimír Čunát
bd1abb36dd
xorg: minor updates of xrandr and util-macros
2014-03-29 16:15:13 +01:00
Vladimír Čunát
9ddc57cbea
xorg.xf86-video-vmware: minor update
...
Patch no longer needed to build.
2014-03-27 22:14:51 +01:00
Vladimír Čunát
576e9289dd
Merge master into x-updates
2014-03-27 21:34:06 +01:00
Lluís Batlle i Rossell
fa5a583098
Bringing back the xkeyboard-config eo patch
2014-03-24 10:42:00 +01:00
Vladimír Čunát
11492176d5
xorg: add "intel-testing" video driver, currently 2.99.911
2014-03-23 22:10:56 +01:00
Vladimír Čunát
150102ce30
xorg.libFS: maintenance update 1.0.5 -> .6
2014-03-21 10:34:20 +01:00
Vladimír Čunát
eac9324034
xorg: fixup after the update
...
All that built before update builds now again (and glamor-egl is new).
2014-03-21 10:34:19 +01:00
Vladimír Čunát
23682d02d0
xorg: update, regenerate (new: glamor-egl)
...
Updates caught by nixpkgs monitor.
2014-03-21 10:34:19 +01:00
Vladimír Čunát
4f50a0917e
xorg: add xf86-video-modesetting
2014-03-21 10:08:31 +01:00
Vladimír Čunát
88d490588d
xorg: add some modules
...
I was testing whether 10.1 mesa might solve the LLVM RTTI problems,
and it seems mesa will need these (and the problems aren't solved).
2014-02-22 18:37:05 +01:00
Vladimír Čunát
5a8a3195a0
xorg.xcb-util-wm: minor update 0.4.0 -> .1
2014-02-22 17:40:01 +01:00
Vladimír Čunát
9a86ad2f7f
xorg.xkeyboard-config: commit forgotten fixups
...
Without these there was also a mysterious collision in nixos etc generation.
2014-02-16 11:25:49 +01:00
Vladimír Čunát
546bd7738d
xorg xkeyboard-config: update, unify with the other expression
2014-01-30 13:46:02 +01:00
Vladimír Čunát
b27477054f
xorg xcb-util-wm: minor update
2014-01-30 09:12:51 +01:00
Vladimír Čunát
edb1e2996f
xorg.xtrans: update to 1.3.3
...
Another forgotten X lib; we had ~2 years without updating it.
2014-01-28 12:11:35 +01:00
Vladimír Čunát
5fb366d1e5
xorg: move nouveau driver here, some updates of modules
...
It seems that most of the modules is rarely used, but still.
Some of the updated modules don't build, just as they didn't before.
2014-01-26 09:03:01 +01:00
Vladimír Čunát
7e0b78f7b2
Merge master into x-updates
...
Conflicts (re-created on master, preserved):
pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
2014-01-23 22:52:18 +01:00
Vladimír Čunát
0a58b512cb
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Vladimír Čunát
fcb9e031f8
xorg.xf86-video-ati: update 7.2.0 -> 7.1.0
...
Proposed by @kosmikus.
2014-01-16 14:36:42 +01:00
Vladimír Čunát
a2c316288c
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Vladimír Čunát
91b7fa9169
Merge master into x-updates
2014-01-11 18:44:55 +01:00
Nixpkgs Monitor
e148a016f5
xlibs.xf86videointel: update from 2.21.9 to 2.21.15
2014-01-08 16:17:32 +01:00
Vladimír Čunát
e01af040ed
xorg.libXfont: bugfix update, CVE-2013-6462
...
This lib is deprecated and almost unused, but still...
2014-01-07 17:51:22 +01:00
Mathijs Kwik
adffa870cf
xf86-video-vmware: xatracker2 patch to build with mesa 10
2014-01-03 09:14:22 +01:00
Vladimír Čunát
f0419a0bfc
xorg: update a few sub-packages
2013-12-30 22:12:22 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
4f8809a091
libXtst: forgotten security update
2013-12-23 18:24:24 +01:00
Vladimír Čunát
095949bdc8
xorg server: maintenance update 1.14.4 -> .5
...
Also drop dri-path patch which wasn't needed for several months,
and now it no longer applied. I tested that drivers are still found.
2013-12-14 23:17:15 +01:00
Peter Simons
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Vladimír Čunát
6e5c003f42
xorg xf86-video-nv: fix build via an upstream patch
2013-11-23 12:31:23 +01:00
Vladimír Čunát
68430cf3d7
Merge branch master into x-updates
...
Conflicts (trivial, minor update on master, major here):
pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Vladimír Čunát
feb778507f
xorg-server: remove now-upstreamed patch
...
I'm sorry I completely forgot to test the previous commit.
Also remove some long unused patch.
2013-11-06 20:07:35 +01:00
Vladimír Čunát
834af9c905
xorg-server: bugfix update 1.14.3 -> .4, including CVE
...
CVE-2013-4396, otherwise a few fixes, see
http://lists.x.org/archives/xorg-announce/2013-November/002352.html
2013-11-05 23:13:31 +01:00
Eelco Dolstra
a0e21fd1ca
Mark more packages as broken
2013-11-04 21:11:00 +01:00
Mathijs Kwik
f4903d890e
Merge branch 'master' into x-updates
2013-11-01 08:35:16 +01:00
Mathijs Kwik
db83d9a35b
Merge branch 'master' into multiple-outputs
2013-11-01 08:29:09 +01:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Eelco Dolstra
aeb3169b71
xorg-server: Fix a 20 year old security bug
...
CVE-2013-4396
2013-10-16 11:58:08 +02:00
Vladimír Čunát
5bcdc3efd2
xorg server: major update 1.13.4 -> 1.14.3
...
- The 1.13 branch gets no updates since April,
so I thought it's a good time to switch.
- Some xorg modules needed to be updated to build,
but some don't have the update (probably all very obscure).
- Maybe it would be good to update the intel driver (or some others),
I don't know.
2013-10-05 22:17:01 +02:00
Mathijs Kwik
1a55c4b89f
Merge remote-tracking branch 'official/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/tools/typesetting/tex/texlive/default.nix
pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Vladimír Čunát
74488e2b58
Merge branch 'x-updates' into stdenv-updates
...
Conflicts (simple):
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Vladimír Čunát
646eaa23a1
xorg.xmodmap: fix build via a Gentoo patch
2013-08-29 15:19:06 +02:00
Eelco Dolstra
7c8518c194
Cleanup
2013-08-23 10:02:07 +02:00
Vladimír Čunát
daf9c75ef4
xorg: bugfix updates of some libs
...
Now using stable release of libXi, instead of the git version we had due
to security stuff.
2013-08-03 15:38:46 +02:00
Vladimír Čunát
625f40151b
Merge branch 'master' into x-updates
...
Conflicts (a little tricky, I did some cleanup of interacting changes):
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/tools/package-management/nixops/default.nix
pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
James Cook
b5553b7cec
luit: fix build with newer gcc ( close #734 )
2013-07-27 19:56:22 +02:00
James Cook
d8dd23e285
luit: configure --disable-selective-werror
...
Compiling luit failed with "implicit declaration of function
'posix_openpt'". Following suggestion at
https://bugs.freedesktop.org/show_bug.cgi?id=47792 to fix it.
2013-07-27 19:56:19 +02:00
Bjørn Forsman
8e3a92e306
libxcb: enable XKB extension
...
SDDM, a display manager that I'm trying to package, depends on this.
2013-07-16 19:25:43 +02:00
Eelco Dolstra
cab211de88
xorg: Split some more packages
2013-06-26 14:27:12 +02:00
Eelco Dolstra
552fd3d599
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/gmime/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Vladimír Čunát
45f7b9c319
virtualbox: make guest additions use driver according to xserver version
2013-06-23 14:16:21 +02:00
Eelco Dolstra
935a054de9
libXrender, libXvMC: Update
2013-06-14 14:53:36 +02:00
Eelco Dolstra
32d02132c2
libxcb: Put docs/manpages in separate outputs
2013-06-11 13:26:27 +02:00
Eelco Dolstra
99b88cfb53
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/acl/default.nix
pkgs/development/libraries/atk/2.6.x.nix
pkgs/development/libraries/attr/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/2.34.x.nix
pkgs/development/libraries/gtk+/2.24.x.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/openssl/default.nix
pkgs/development/libraries/pango/1.30.x.nix
pkgs/misc/cups/default.nix
pkgs/os-specific/linux/util-linux/default.nix
pkgs/servers/x11/xorg/builder.sh
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02:00
Vladimír Čunát
ba6c764a51
xorg: intel driver bugfix update
2013-06-08 15:40:39 +00: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
Vladimír Čunát
466ce40f0f
xorg.xf86videointel: regression-fix update
...
http://lists.freedesktop.org/archives/intel-gfx/2013-May/028277.html
2013-05-27 20:43:02 +02:00
Vladimír Čunát
e7b61ea77d
xorg.xf86videointel: fix bad hash (from #556 )
2013-05-27 12:24:04 +02:00
Vladimír Čunát
ce456ab779
Merge pull request #556 from jcumming/x-updates.130523
...
update Intel Graphics Stack Release
2013-05-27 02:33:48 -07:00
Jack Cummings
fc8f474a9c
fix url and hash for intel x driver
2013-05-24 11:56:48 -07:00
Jack Cummings
800c467592
xf86-video-intel-2.21.7
2013-05-24 09:50:49 -07:00
Jack Cummings
253ee6f6a3
update to 2013Q1 Intel Graphics Stack Release
...
This changeset updates to all of the versions in
https://01.org/linuxgraphics/downloads/2013/2013q1-intel-graphics-stack-release
(but does not regression from newer version).
I tried generating 'servers/x11/xorg/default.nix' with the perl script,
but unrelated packges changed, so I just manually updated the file.
2013-05-23 16:25:21 -07:00
Vladimír Čunát
e3ff0f116f
vmware driver: depend on mesa_drivers to find libxatracker
2013-05-23 22:52:46 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
0b416310fc
xorg-server: clear the bogus font paths
2013-04-25 16:57:36 +02:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Evgeny Egorochkin
5084f47e47
Add a working mirror for xcb-util-renderutil
2013-04-21 05:31:31 +03:00
Vladimír Čunát
c859a46712
xorg: update xorgserver to 1.13.4, and more
...
- update some modules to work with the newer server
- fix many other modules via overrides
- huge cleanup in overrides via better propagation
and pixman include flattening
- URLs of XCB stuff have been moved
2013-04-18 21:33:17 +02:00
Vladimír Čunát
7716b78fc7
pixman: use pixman_cairo for xorg, flatten its includes
2013-04-18 21:31:56 +02:00
Vladimír Čunát
a40e825474
xorg-server: fix CVE-1940
...
http://lists.x.org/archives/xorg-devel/2013-April/036014.html
It's a low-priority issue, but it should cause almost no rebuilds.
2013-04-18 12:50:26 +02:00
Jaka Hudoklin
83afbf45ca
Add xf86videodummy and xf86inputvoid to xorg overrides (pixman fix)
2013-03-30 11:52:44 +01:00
Shea Levy
fc3994074e
Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs
...
The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:19:02 -05:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Sander van der Burg
31c198a40e
xf86-video-intel: bump to 2.20.19
2013-03-05 10:18:05 +01:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Patrick Wheeler
8cdfd46d96
Fix xf86vmware fix
...
Moved xf86vmware fix into the overrides.nix file where and not in the
generated default.nix.
2013-03-02 01:08:33 +01:00
Patrick John Wheeler
d5ec021cdb
Making xlibs.xf86videovmware build
2013-02-27 06:44:41 +01:00
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
Eelco Dolstra
61129e1ee9
Split some GTK/X11-related packages
...
The closure of the Pan newsreader is now down from 344 MiB to 195 MiB.
2012-08-26 22:53:19 -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