diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-22 23:54:34 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-22 23:54:34 +0200 |
| commit | cdbd81ce144f17644ceebd3d08723aa244696a05 (patch) | |
| tree | f2d4c484a5a8880fb32b81ac4330842c88a53e2a /gnu/packages/gnome.scm | |
| parent | 10664c0f1c351eae24629127d97fe23f5e18a93c (diff) | |
| parent | ec130e1a1b7f3b87b1a6e626754f7e7a07f6b717 (diff) | |
| download | guix-cdbd81ce144f17644ceebd3d08723aa244696a05.tar.gz | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3b80692e90..908b5782b5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -142,6 +142,7 @@ #:use-module (gnu packages geo) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) + #:use-module (gnu packages groff) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -7336,6 +7337,28 @@ jQuery.Syntax JavaScript libraries.") (base32 "0h9vf4fx056imjf8ibmn03wg1c3hniipy1nsm2jqi62lp1m19c95")))) (build-system glib-or-gtk-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-man-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Invoke 'man' directly instead of searching $PATH. + (substitute* '("libyelp/yelp-man-parser.c" + "libyelp/yelp-uri.c") + (("\"man\"") + (string-append "\"" + (search-input-file inputs "bin/man") + "\"")) + (("G_SPAWN_SEARCH_PATH") + "0")))) + (add-after 'install 'help-man-find-its-dependencies + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; XXX: Currently 'man' looks for 'groff' in $PATH in one + ;; case. This should be fixed in 'man-db' proper. + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/yelp") + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "bin/groff")))))))))) (native-inputs (list `(,glib "bin") ; for glib-genmarshal, etc. intltool @@ -7347,6 +7370,8 @@ jQuery.Syntax JavaScript libraries.") (list gsettings-desktop-schemas libhandy libxslt + man-db ;for URIs like "man:ls" + groff-minimal ;ditto sqlite webkitgtk yelp-xsl)) @@ -10472,7 +10497,9 @@ like automatic language detection, text-to-speech and clipboard buttons.") name "-" version ".tar.xz")) (sha256 (base32 - "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f")))) + "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f")) + (patches + (search-patches "gnome-dictionary-meson-i18n.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t |