nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
master
Marius Bakke 2018-03-07 13:10:57 +01:00
parent 29c7b4d638
commit 6a49ae7864
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/gtk.scm
View File

@ -1065,7 +1065,7 @@ toolkit.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ;for 'glib-compile-resources' ("glib" ,glib "bin") ;for 'glib-compile-resources'
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server-1.19.3)))
(propagated-inputs (propagated-inputs
`(("pangomm" ,pangomm) `(("pangomm" ,pangomm)
("cairomm" ,cairomm) ("cairomm" ,cairomm)
@ -1073,9 +1073,10 @@ toolkit.")
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("glibmm" ,glibmm))) ("glibmm" ,glibmm)))
(arguments (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. ;; compiler is >= GCC6.
#:configure-flags '("CXXFLAGS=-std=gnu++14") #:configure-flags '("CXXFLAGS=-std=gnu++14")
#:disallowed-references (,xorg-server-1.19.3)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'check 'run-xvfb (add-before 'check 'run-xvfb
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)