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

gnu: zathura, girara: Use the test-only xorg variant for tests. 

* gnu/packages/gtk.scm (girara)[native-inputs]: Replace XORG-SERVER with
XORG-SERVER-1.19.3.
[arguments]: Add #:disallowed-references.
* gnu/packages/pdf.scm (zathura)[native-inputs, arguments]: Likewise.
This commit is contained in:
Marius Bakke 2018-02-17 00:10:08 +01:00
parent f0eba502a1
commit 2416665ecb
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/gtk.scm
View File

@ -1251,7 +1251,7 @@ write GNOME applications.")
("check" ,check) ("check" ,check)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ("glib:bin" ,glib "bin")
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server-1.19.3)))
;; Listed in 'Requires.private' of 'girara.pc'. ;; Listed in 'Requires.private' of 'girara.pc'.
(propagated-inputs `(("gtk+" ,gtk+))) (propagated-inputs `(("gtk+" ,gtk+)))
(arguments (arguments
@ -1259,6 +1259,7 @@ write GNOME applications.")
`(,(string-append "PREFIX=" (assoc-ref %outputs "out")) `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"COLOR=0" "CC=gcc") "COLOR=0" "CC=gcc")
#:test-target "test" #:test-target "test"
#:disallowed-references (,xorg-server-1.19.3)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'check 'start-xserver (add-before 'check 'start-xserver

3
gnu/packages/pdf.scm
View File

@ -498,7 +498,7 @@ by using the poppler rendering engine.")
;; For tests. ;; For tests.
("check" ,check) ("check" ,check)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server-1.19.3)))
(inputs `(("sqlite" ,sqlite))) (inputs `(("sqlite" ,sqlite)))
;; Listed in 'Requires.private' of 'zathura.pc'. ;; Listed in 'Requires.private' of 'zathura.pc'.
(propagated-inputs `(("cairo" ,cairo) (propagated-inputs `(("cairo" ,cairo)
@ -513,6 +513,7 @@ by using the poppler rendering engine.")
`(,(string-append "PREFIX=" (assoc-ref %outputs "out")) `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc" "COLOR=0") "CC=gcc" "COLOR=0")
#:test-target "test" #:test-target "test"
#:disallowed-references (,xorg-server-1.19.3)
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'check 'start-xserver (add-before 'check 'start-xserver