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

gnu: mesa: Fix build on non-intel systems. 

* gnu/packages/gl.scm (mesa): On non-intel systems, pass
  "--with-dri-drivers=" configure flag with i915 and i965 removed.
This commit is contained in:
Mark H Weaver 2015-01-01 01:55:37 -05:00
parent 171bf17cc5
commit 0f481f0616
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/gl.scm
View File

@ -20,6 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gl) (define-module (gnu packages gl)
#:use-module (ice-9 match)
#:use-module ((guix licenses) #:prefix l:) #:use-module ((guix licenses) #:prefix l:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -161,9 +162,17 @@ Polygon meshes, and Extruded polygon meshes")
("python" ,python-2))) ; incompatible with Python 3 (print syntax) ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
`(;; drop r300 from default gallium drivers, as it requires llvm '(;; drop r300 from default gallium drivers, as it requires llvm
"--with-gallium-drivers=r600,svga,swrast" "--with-gallium-drivers=r600,svga,swrast"
"--enable-xa") "--enable-xa"
;; on non-intel systems, drop i915 and i965
;; from the default dri drivers
,@(match (%current-system)
((or "x86_64-linux" "i686-linux")
'())
(_
'("--with-dri-drivers=nouveau,r200,radeon,swrast"))))
#:phases (alist-cons-after #:phases (alist-cons-after
'unpack 'add-missing-m4-files 'unpack 'add-missing-m4-files
(lambda _ (lambda _