gnu: xorg: Fix compilation of xorg-server.
* gnu/packages/xorg.scm (mesa): Propagate input libxxf86vm.
This commit is contained in:
Andreas Enge
parent
1f44111f83
commit
3a5d958570
|
|
@ -4343,71 +4343,6 @@ (define-public xproto
|
|||
|
||||
|
||||
|
||||
;; package outside the x.org system proper of height 2
|
||||
|
||||
(define-public mesa
|
||||
(package
|
||||
(name "mesa")
|
||||
;; In newer versions (9.0.5 and 9.1 tested), "make" results in an
|
||||
;; infinite configure loop, see
|
||||
;; https://bugs.freedesktop.org/show_bug.cgi?id=61527
|
||||
(version "8.0.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"ftp://ftp.freedesktop.org/pub/mesa/" version
|
||||
"/MesaLib-" version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("glproto" ,glproto)
|
||||
("libdrm" ,libdrm-2.4.33)
|
||||
("libxdamage" ,libxdamage)))
|
||||
(inputs
|
||||
`(("bison" ,bison)
|
||||
("dri2proto" ,dri2proto)
|
||||
("expat" ,expat)
|
||||
("flex" ,flex)
|
||||
("libx11" ,libx11)
|
||||
("libxext" ,libxext)
|
||||
("libxfixes" ,libxfixes)
|
||||
("libxml2" ,libxml2)
|
||||
("libxxf86vm" ,libxxf86vm)
|
||||
("makedepend" ,makedepend)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
|
||||
#:phases
|
||||
(alist-cons-after
|
||||
'unpack 'remove-symlink
|
||||
(lambda* (#:key #:allow-other-keys)
|
||||
;; remove dangling symlink to /usr/include/wine/windows
|
||||
(delete-file "src/gallium/state_trackers/d3d1x/w32api"))
|
||||
(alist-replace
|
||||
'configure
|
||||
(lambda* (#:key inputs #:allow-other-keys #:rest args)
|
||||
(let ((configure (assoc-ref %standard-phases 'configure))
|
||||
(libxml2 (assoc-ref inputs "libxml2")))
|
||||
;; FIXME: This should be done more centrally.
|
||||
(setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages"))
|
||||
(apply configure args)))
|
||||
%standard-phases))))
|
||||
(home-page "http://mesa3d.org/")
|
||||
(synopsis "Mesa, an OpenGL implementation")
|
||||
(description "Mesa is a free implementation of the OpenGL specification -
|
||||
a system for rendering interactive 3D graphics. A variety of device drivers
|
||||
allows Mesa to be used in many different environments ranging from software
|
||||
emulation to complete hardware acceleration for modern GPUs.")
|
||||
(license license:x11)))
|
||||
|
||||
|
||||
|
||||
;; packages of height 2 in the propagated-inputs tree
|
||||
|
||||
(define-public libice
|
||||
|
|
@ -4639,6 +4574,104 @@ (define-public libxxf86vm
|
|||
(license license:x11)))
|
||||
|
||||
|
||||
;; package outside the x.org system proper of height 3
|
||||
|
||||
(define-public mesa
|
||||
(package
|
||||
(name "mesa")
|
||||
;; In newer versions (9.0.5 and 9.1 tested), "make" results in an
|
||||
;; infinite configure loop, see
|
||||
;; https://bugs.freedesktop.org/show_bug.cgi?id=61527
|
||||
(version "8.0.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"ftp://ftp.freedesktop.org/pub/mesa/" version
|
||||
"/MesaLib-" version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("glproto" ,glproto)
|
||||
("libdrm" ,libdrm-2.4.33)
|
||||
("libxdamage" ,libxdamage)
|
||||
("libxxf86vm" ,libxxf86vm)))
|
||||
(inputs
|
||||
`(("bison" ,bison)
|
||||
("dri2proto" ,dri2proto)
|
||||
("expat" ,expat)
|
||||
("flex" ,flex)
|
||||
("libx11" ,libx11)
|
||||
("libxext" ,libxext)
|
||||
("libxfixes" ,libxfixes)
|
||||
("libxml2" ,libxml2)
|
||||
("makedepend" ,makedepend)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
|
||||
#:phases
|
||||
(alist-cons-after
|
||||
'unpack 'remove-symlink
|
||||
(lambda* (#:key #:allow-other-keys)
|
||||
;; remove dangling symlink to /usr/include/wine/windows
|
||||
(delete-file "src/gallium/state_trackers/d3d1x/w32api"))
|
||||
(alist-replace
|
||||
'configure
|
||||
(lambda* (#:key inputs #:allow-other-keys #:rest args)
|
||||
(let ((configure (assoc-ref %standard-phases 'configure))
|
||||
(libxml2 (assoc-ref inputs "libxml2")))
|
||||
;; FIXME: This should be done more centrally.
|
||||
(setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages"))
|
||||
(apply configure args)))
|
||||
%standard-phases))))
|
||||
(home-page "http://mesa3d.org/")
|
||||
(synopsis "Mesa, an OpenGL implementation")
|
||||
(description "Mesa is a free implementation of the OpenGL specification -
|
||||
a system for rendering interactive 3D graphics. A variety of device drivers
|
||||
allows Mesa to be used in many different environments ranging from software
|
||||
emulation to complete hardware acceleration for modern GPUs.")
|
||||
(license license:x11)))
|
||||
|
||||
|
||||
|
||||
;; packages of height 3 in the propagated-inputs tree
|
||||
|
||||
(define-public libxcb
|
||||
(package
|
||||
(name "libxcb")
|
||||
(version "1.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://xcb.freedesktop.org/dist/libxcb-"
|
||||
version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("libpthread-stubs" ,libpthread-stubs)
|
||||
("libxau" ,libxau)
|
||||
("libxdmcp" ,libxdmcp)))
|
||||
(inputs
|
||||
`(("xcb-proto" ,xcb-proto)
|
||||
("libxslt" ,libxslt)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)
|
||||
("xproto" ,xproto)))
|
||||
(home-page "http://www.x.org/wiki/")
|
||||
(synopsis "xorg implementation of the X Window System")
|
||||
(description "X.org provides an implementation of the X Window System")
|
||||
(license license:x11)))
|
||||
|
||||
|
||||
(define-public xorg-server
|
||||
(package
|
||||
(name "xorg-server")
|
||||
|
|
@ -4715,39 +4748,6 @@ (define-public xorg-server
|
|||
|
||||
|
||||
|
||||
;; packages of height 3 in the propagated-inputs tree
|
||||
|
||||
(define-public libxcb
|
||||
(package
|
||||
(name "libxcb")
|
||||
(version "1.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://xcb.freedesktop.org/dist/libxcb-"
|
||||
version
|
||||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("libpthread-stubs" ,libpthread-stubs)
|
||||
("libxau" ,libxau)
|
||||
("libxdmcp" ,libxdmcp)))
|
||||
(inputs
|
||||
`(("xcb-proto" ,xcb-proto)
|
||||
("libxslt" ,libxslt)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)
|
||||
("xproto" ,xproto)))
|
||||
(home-page "http://www.x.org/wiki/")
|
||||
(synopsis "xorg implementation of the X Window System")
|
||||
(description "X.org provides an implementation of the X Window System")
|
||||
(license license:x11)))
|
||||
|
||||
|
||||
;; packages of height 4 in the propagated-inputs tree
|
||||
|
||||
(define-public libx11
|
||||
|
|
|
|||
Loading…
Reference in a new issue