path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/xorg.scm5
-rw-r--r--gnu/services/xorg.scm3
2 files changed, 2 insertions, 6 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ad2c3e363a..ecaf3ab366 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2677,10 +2677,7 @@ devices, thus making direct access unnecessary.")
(base32
"0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"))))
(build-system gnu-build-system)
- (inputs `(;; FIXME: This is a libdrm version incompatible with that of
- ;; MESA, which xorg-server uses. Therefore, using this driver
- ;; leads to "unresolved symbol drmModeSetCursor2".
- ("libdrm" ,libdrm)
+ (inputs `(("libdrm" ,libdrm)
("xf86driproto" ,xf86driproto)
("libx11" ,libx11)
("xorg-server" ,xorg-server)))
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 27a72e8019..d11def6333 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -90,8 +90,7 @@ Section \"Files\"
FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\"
-# FIXME: Commented out due to libdrm incompatibility.
-# ModulePath \"" xf86-video-modesetting "/lib/xorg/modules/drivers\"
+ ModulePath \"" xf86-video-modesetting "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-video-cirrus "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\"
ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"
ton' href='/guix/plain/NEWS?id=12d8adbfc0f32a1905cfc3aaa2cfff68ee46a333'>plainabout -rw-r--r--README5919logplainabout -rw-r--r--ROADMAP3237logplainabout -rw-r--r--THANKS2381logplainabout -rw-r--r--TODO4360logplainabout -rwxr-xr-xbootstrap904logplainabout d---------build-aux778logplain -rw-r--r--config-daemon.ac4808logplainabout -rw-r--r--configure.ac9291logplainabout -rw-r--r--d3.v3.js339545logplainabout d---------doc406logplain d---------etc506logplain -rw-r--r--gnu.scm5345logplainabout d---------gnu660logplain -rw-r--r--graph.js4207logplainabout -rw-r--r--guix.scm1357logplainabout d---------guix2894logplain d---------m435logplain d---------nix282logplain d---------po96logplain d---------scripts35logplain d---------tests3909logplain