Vladimír Čunát
a03ff26080
Merge #15639 : xorg-server 1.17.4 -> 1.18.3
...
... and fglrxCompat to maintain compatibility.
2016-06-05 00:52:06 +02:00
Vladimír Čunát
81039713fa
Merge branch 'master' into staging
...
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
obadz
331fa2feff
xsession: fix variable read before set introduced in c99608c
2016-05-25 17:47:36 +01:00
Eelco Dolstra
c99608c638
Add an option to write the X session log to the journal
...
... rather than ~/.xsession-errors. It might make sense to make this
the default, in order to eliminate ad hoc, uncentralised, poorly
discoverable log files.
2016-05-24 21:46:38 +02:00
Eelco Dolstra
d84741a4bf
X server: Log to the journal instead of /var/log/X.0.log
...
This ensures that "journalctl -u display-manager" does what you would
expect in 2016. However, the main reason is to ensure that our VM
tests show the output of the X server.
A slight problem is that with KDE user switching, messages from the
various X servers end up in the same place. However, that's an
improvement over the previous situation, where the second X server
would overwrite the /var/log/X.0.log of the first. (This was caused by
the fact that we were passing a hard-coded value for -logfile.)
2016-05-24 21:45:26 +02:00
Vladimír Čunát
358533dc61
nixos xserver: fix evdev driver with xserver 1.18
...
... and add its man page.
Now I seem to be running fine with the new server.
2016-05-23 13:02:55 +02:00
Vladimír Čunát
69cc0a7bc5
xf86-input-evdev: split dev output
2016-05-23 13:02:55 +02:00
Vladimír Čunát
0b192a0976
Merge branch 'master' into staging
...
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Eelco Dolstra
c7d92f9485
xf86-video-modesetting: Remove
...
This driver is part of xorg-server now, so we were using an outdated
version.
2016-05-22 23:05:30 +02:00
Vladimír Čunát
f4eb808554
xf86-input-synaptics: split dev output
2016-05-22 12:10:38 +02:00
Tuomas Tynkkynen
f81af4e6f0
treewide: Make explicit that 'dev' output of glib is used
2016-05-19 10:00:35 +02:00
José Romildo Malaquias
44d347aba5
xfce4: rename application xfce4screenshooter to xfce4-screenshooter
2016-05-15 06:56:46 -03:00
Nikolay Amiantov
5c39f28a9f
Merge pull request #15024 from abbradar/xfce-no-desktop
...
xfce service: add noDesktop option
2016-05-14 04:55:27 +03:00
Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
rnhmjoj
e8fff51947
unclutter: prevent service restarting too soon
2016-05-09 23:28:30 +02:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Joachim Fasting
5f09248ae8
Merge pull request #15228 from rnhmjoj/master
...
unclutter: switch to user service and add options
2016-05-05 18:37:27 +02:00
Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
rnhmjoj
e34814e317
unclutter: switch to user service and add options
2016-05-04 21:15:49 +02:00
Mitchell Pleune
571e9b5f1f
bspwm: add _JAVA_AWT_WM_NONREPARENTING=1
...
bspwm is not in java's internal list of non-reparrenting
window managers. See https://awesomewm.org/wiki/Problems_with_Java
2016-05-03 17:46:48 -04:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Thomas Tuegel
dbe1bb06d9
Merge pull request #14741 from cruegge/dbus-activation-environment
...
xsession: Update DBus activation environment
2016-05-01 06:55:35 -05:00
Thomas Tuegel
370120bd5f
kde5: don't install GStreamer modules system-wide
2016-04-30 12:22:01 -05:00
Nikolay Amiantov
c4440c9c74
Revert "pulseaudio: select correct outputs"
...
This reverts commit 5e2bb0b31c
.
2016-04-28 17:06:09 +03:00
Nikolay Amiantov
5e2bb0b31c
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:45:42 +03:00
Nikolay Amiantov
d619a75da1
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:42:16 +03:00
Nikolay Amiantov
21f984f590
xfce service: add noDesktop option
2016-04-27 14:59:56 +03:00
Thomas Tuegel
522ed7ce76
nixos/kde5: phonon-backend-gstreamer is not optional
2016-04-25 19:04:24 -05:00
Thomas Tuegel
5896befee0
nixos/kde5: install kactivitymanagerd
2016-04-25 19:04:24 -05:00
Christoph Ruegge
769a33bedd
xsession: make updating DBus environment optional
2016-04-25 23:37:18 +02:00
Nikolay Amiantov
5f19542581
Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:23 +03:00
Nikolay Amiantov
09f02b918e
Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:10 +03:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Franz Pletz
882391a162
redshift service: run as user service
...
Fixes #14882 .
2016-04-24 19:48:10 +02:00
Thomas Tuegel
b4ff81ffd6
phonon-backend-vlc: init at 0.9.0
2016-04-22 08:11:10 -05:00
Thomas Tuegel
8b585cc9f5
phonon: 4.8.3 -> 4.9.0
...
- Removed phonon-backend-vlc.
- Moved qt5.phonon to kde5.phonon.
2016-04-22 07:56:02 -05:00
Thomas Tuegel
2780894b1b
kde5.startkde: init at 5.5.5
2016-04-20 10:01:06 -05:00
Christoph Ruegge
f270af1acd
xsession: Update DBus activation environment
...
`dbus-launch` is executed early in the script, before desktop managers
had a chance to setup the environment. If DBus activation is used,
applications launched by this may therefore lack necessary environment
variables. This patch sends the complete environment to DBus after
launching the desktop manager.
2016-04-15 21:43:42 +02:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Eelco Dolstra
9153d8ed64
Fix X11 tests broken by the removal of -ac
...
Probably missed a few. Also adding xauth to the system path (it was
already in the closure).
2016-04-12 19:13:47 +02:00
Eelco Dolstra
1541fa351b
X server: Enable local access control
...
For the last ten years we have been passing -ac to the X server, which
is very bad idea.
Fixes #14623 .
2016-04-12 18:39:40 +02:00
aszlig
c1178f171c
nixos/xserver: Use null as default for dpi option
...
Commit 98d9bba
introduced this option as a nullOr type and it actually
checks whether null has been set and only appends -dpi if that's the
case. So let's actually set the default to null instead of 0.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-10 17:46:17 +02:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Brandon Edens
98d9bbaec2
Add DPI option to xserver invocation.
2016-04-08 18:53:42 -07:00
Thomas Tuegel
4ac323d924
kde5: enable libmtp udev rules
2016-04-07 07:44:26 -05:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Nikolay Amiantov
63f1eb6b00
xserver service: add glamoregl for intel drivers
...
Closes #14286
Credits to vcunat for the initial patch.
2016-03-29 18:52:04 +03:00
joachifm
3273605aef
Merge pull request #14033 from joachifm/clfswm-broken
...
Mark clfswm as broken
2016-03-20 15:27:41 +00:00
Joachim Fasting
e891e50946
nixos: disable the clfswm window manager module
2016-03-19 15:52:18 +01:00