From 97f94f5e9b610781e19ba9e7584ffe46d859de2e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 6 Jan 2015 13:11:43 -0500 Subject: 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 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ce1c533df8..dae3bac567 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 ;;; Copyright © 2013, 2014 Ludovic Courtès -;;; Copyright © 2014 Mark H Weaver +;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; ;;; This file is part of GNU Guix. @@ -418,18 +418,9 @@ (define-public gtk+ ("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) -- cgit v1.2.3