[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: zathura, girara: Use the test-only xorg variant for tests.
From: |
Marius Bakke |
Subject: |
03/05: gnu: zathura, girara: Use the test-only xorg variant for tests. |
Date: |
Sat, 17 Feb 2018 10:17:13 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 2416665ecbc931f9ed6da8d905b89da09e42ef24
Author: Marius Bakke <address@hidden>
Date: Sat Feb 17 00:10:08 2018 +0100
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.
---
gnu/packages/gtk.scm | 3 ++-
gnu/packages/pdf.scm | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c05d073..8b2b357 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1251,7 +1251,7 @@ write GNOME applications.")
("check" ,check)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server)))
+ ("xorg-server" ,xorg-server-1.19.3)))
;; Listed in 'Requires.private' of 'girara.pc'.
(propagated-inputs `(("gtk+" ,gtk+)))
(arguments
@@ -1259,6 +1259,7 @@ write GNOME applications.")
`(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"COLOR=0" "CC=gcc")
#:test-target "test"
+ #:disallowed-references (,xorg-server-1.19.3)
#:phases (modify-phases %standard-phases
(delete 'configure)
(add-before 'check 'start-xserver
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index aba7b97..2a447a9 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -498,7 +498,7 @@ by using the poppler rendering engine.")
;; For tests.
("check" ,check)
- ("xorg-server" ,xorg-server)))
+ ("xorg-server" ,xorg-server-1.19.3)))
(inputs `(("sqlite" ,sqlite)))
;; Listed in 'Requires.private' of 'zathura.pc'.
(propagated-inputs `(("cairo" ,cairo)
@@ -513,6 +513,7 @@ by using the poppler rendering engine.")
`(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc" "COLOR=0")
#:test-target "test"
+ #:disallowed-references (,xorg-server-1.19.3)
#:phases (modify-phases %standard-phases
(delete 'configure)
(add-before 'check 'start-xserver
- branch master updated (bb3359a -> 3ce4e26), Marius Bakke, 2018/02/17
- 02/05: gnu: zathura: Increase test timeouts., Marius Bakke, 2018/02/17
- 01/05: gnu: girara: Increase test timeouts., Marius Bakke, 2018/02/17
- 03/05: gnu: zathura, girara: Use the test-only xorg variant for tests.,
Marius Bakke <=
- 05/05: gnu: btrfs-progs: Fix bash completions., Marius Bakke, 2018/02/17
- 04/05: gnu: zathura: Don't propagate girara in dependent packages., Marius Bakke, 2018/02/17