diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-12-19 20:55:59 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-12-19 23:28:17 -0500 |
| commit | 3fc4eb211e679144a935b1d56b6e1906900e7649 (patch) | |
| tree | 1f2aa2f89578b3a89254363114cc1bd6f8a3f58f /gnu | |
| parent | 7007aeb2876645e2c866a70bfdec60d28910e9ab (diff) | |
| download | guix-3fc4eb211e679144a935b1d56b6e1906900e7649.tar.gz guix-3fc4eb211e679144a935b1d56b6e1906900e7649.zip | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/xorg.scm | 5 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 3 |
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\" |