aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-07 13:10:57 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-07 14:53:24 +0100
commit6a49ae786487013cecd97a372514b75c77282b50 (patch)
tree297517858c413d7cd9f9a7fe057fb3674ba4ce1b /gnu/packages
parent29c7b4d6389d7d0ae70f2d87f27433431ac74890 (diff)
downloadguix-6a49ae786487013cecd97a372514b75c77282b50.tar
guix-6a49ae786487013cecd97a372514b75c77282b50.tar.gz
gnu: gtkmm: Use the for-test xorg variant for tests.
* gnu/packages/gtk.scm (gtkmm)[native-inputs]: Replace XORG-SERVER with XORG-SERVER-1.19.3. [arguments]: Add #:disallowed-references.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/gtk.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 3a67e84d2a..9fc9fd6015 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1065,7 +1065,7 @@ toolkit.")
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ;for 'glib-compile-resources'
- ("xorg-server" ,xorg-server)))
+ ("xorg-server" ,xorg-server-1.19.3)))
(propagated-inputs
`(("pangomm" ,pangomm)
("cairomm" ,cairomm)
@@ -1073,9 +1073,10 @@ toolkit.")
("gtk+" ,gtk+)
("glibmm" ,glibmm)))
(arguments
- '(;; XXX: Tests require C++14 or later. Remove this when the default
+ `(;; XXX: Tests require C++14 or later. Remove this when the default
;; compiler is >= GCC6.
#:configure-flags '("CXXFLAGS=-std=gnu++14")
+ #:disallowed-references (,xorg-server-1.19.3)
#:phases (modify-phases %standard-phases
(add-before 'check 'run-xvfb
(lambda* (#:key inputs #:allow-other-keys)