diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-04-08 00:54:01 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-08 00:54:01 +0200 |
| commit | ba00235a9652bb129ff6867ffc3c7cfafe1cca09 (patch) | |
| tree | 1ce56f512707e89362e1fed3d5b26d690462fbda /gnu/packages/gnome.scm | |
| parent | f19ccdc62ca721b68745c35b046826b356f46c62 (diff) | |
| parent | 0e2b0b05accdea7c3f016f8483d0ec04021114d3 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c54cd65ff2..ff8e8ad2e0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -112,6 +112,7 @@ #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) + #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) @@ -5901,6 +5902,17 @@ properties, screen resolution, and other GNOME parameters.") ;; Convert the logo from SVG to PNG. (invoke "inkscape" "--export-png=data/theme/guix-logo.png" "data/theme/guix-logo.svg"))) + (add-before 'configure 'record-absolute-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "js/misc/ibusManager.js" + (("'ibus-daemon'") + (string-append "'" (assoc-ref inputs "ibus") + "/bin/ibus-daemon'"))) + (substitute* "js/ui/status/keyboard.js" + (("'gkbd-keyboard-display'") + (string-append "'" (assoc-ref inputs "libgnomekbd") + "/bin/gkbd-keyboard-display'"))) + #t)) (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) ;; Tests require a running X server. @@ -5965,6 +5977,7 @@ properties, screen resolution, and other GNOME parameters.") ("ibus" ,ibus) ("libcanberra" ,libcanberra) ("libcroco" ,libcroco) + ("libgnomekbd" ,libgnomekbd) ;for gkbd-keyboard-display ("libgweather" ,libgweather) ("libsoup" ,libsoup) ("mesa-headers" ,mesa-headers) |