ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 14:28:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gtk+: Include xorg-server in native-inputs on MIPS; enable tests.

Browse source 
* gnu/packages/gtk.scm (gtk+)[native-inputs]: Unconditionally include
  xorg-server and enable tests.
This commit is contained in:
Mark H Weaver 2015-01-06 13:11:43 -05:00
parent cd06768e66
commit 97f94f5e9b
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/gtk.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -418,18 +418,9 @@ (define-public gtk+
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("xorg-server" ,xorg-server)))
;; FIXME: The Xorg server is needed to run the tests, but it currently
;; fails to build on mips64el, so remove it in the meantime.
,@(if (string=? (or (%current-target-system) (%current-system))
"mips64el-linux")
'()
`(("xorg-server" ,xorg-server)))))
(arguments (arguments
`(;; FIXME: See above. `(#:phases
#:tests? ,(not (string=? (or (%current-target-system) (%current-system))
"mips64el-linux"))
#:phases
(alist-replace (alist-replace
'configure 'configure
(lambda* (#:key inputs #:allow-other-keys #:rest args) (lambda* (#:key inputs #:allow-other-keys #:rest args)