nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: xf86-video-modesetting: Now uses the same libdrm as mesa. 

* gnu/packages/xorg.scm (xf86-video-modesetting): Remove a comment stating
  that the libdrm used in this driver is incompatible with the one in mesa,
  because it is no longer true.
* gnu/services/xorg.scm (xserver.conf): Uncomment 'xf86-video-modesetting'
  ModulePath and remove associated comment.
This commit is contained in:
Mark H Weaver 2014-12-19 20:55:59 -05:00
parent 7007aeb287
commit 3fc4eb211e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/xorg.scm
View File

@ -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)))

3
gnu/services/xorg.scm
View File

@ -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\"