~ruther/guix-local

2416665ecbc931f9ed6da8d905b89da09e42ef24 — Marius Bakke 8 years ago f0eba50
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.
2 files changed, 4 insertions(+), 2 deletions(-)

M gnu/packages/gtk.scm
M gnu/packages/pdf.scm
M gnu/packages/gtk.scm => gnu/packages/gtk.scm +2 -1
@@ 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

M gnu/packages/pdf.scm => gnu/packages/pdf.scm +2 -1
@@ 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