diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-12-31 14:10:25 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-12-31 14:10:25 +0200 |
| commit | 23de2e1d5f8f7548e6f73085de23d9964774edbf (patch) | |
| tree | fab69d4bb55f275f14012a724b7cb14bd307b57f /gnu/packages/gtk.scm | |
| parent | ec6ba5c1fe9308cbc18f06c99adcfe0d13396a18 (diff) | |
| parent | 1c27f72fc2770d68243dd95b7c05adc3b2b02ea4 (diff) | |
| download | patches-23de2e1d5f8f7548e6f73085de23d9964774edbf.tar patches-23de2e1d5f8f7548e6f73085de23d9964774edbf.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bfc298f6aa..00d9093669 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -16,6 +16,7 @@ ;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Coypright © 2017 Roel Janssen <roel@gnu.org> ;;; Coypright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Coypright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1240,7 +1241,7 @@ write GNOME applications.") (define-public girara (package (name "girara") - (version "0.2.7") + (version "0.2.8") (source (origin (method url-fetch) (uri @@ -1248,19 +1249,31 @@ write GNOME applications.") version ".tar.gz")) (sha256 (base32 - "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq")))) + "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98")))) (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal))) - (inputs `(("gtk+" ,gtk+) - ("check" ,check))) + ("check" ,check) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("xorg-server" ,xorg-server))) + ;; Listed in 'Requires.private' of 'girara.pc'. + (propagated-inputs `(("gtk+" ,gtk+))) (arguments `(#:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out")) "COLOR=0" "CC=gcc") #:test-target "test" - #:tests? #f ; Tests fail with "Gtk cannot open display:" - #:phases - (modify-phases %standard-phases (delete 'configure)))) + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + ;; Don't fail due to missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system (string-append xorg-server "/bin/Xvfb " + display " &"))))))))) (build-system gnu-build-system) (home-page "https://pwmt.org/projects/girara/") (synopsis "Library for minimalistic gtk+3 user interfaces") |