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

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 97f94f5e9b610781e19ba9e7584ffe46d859de2e
Author: Mark H Weaver <address@hidden>
Date:   Tue Jan 6 13:11:43 2015 -0500

    gnu: gtk+: Include xorg-server in native-inputs on MIPS; enable tests.
    
    * gnu/packages/gtk.scm (gtk+)[native-inputs]: Unconditionally include
      xorg-server and enable tests.
---
 gnu/packages/gtk.scm |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ce1c533..dae3bac 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <address@hidden>
 ;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
-;;; Copyright © 2014 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2014 Eric Bavier <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -418,18 +418,9 @@ application suites.")
       ("pkg-config" ,pkg-config)
       ("gobject-introspection" ,gobject-introspection)
       ("python-wrapper" ,python-wrapper)
-
-      ;; 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)))))
+      ("xorg-server" ,xorg-server)))
    (arguments
-    `(;; FIXME: See above.
-      #:tests? ,(not (string=? (or (%current-target-system) (%current-system))
-                               "mips64el-linux"))
-      #:phases
+    `(#:phases
       (alist-replace
        'configure
        (lambda* (#:key inputs #:allow-other-keys #:rest args)