diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-09-13 09:31:15 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-09-13 13:22:13 +0100 |
| commit | 1192ae940434808560b3170107e4ce44855816c3 (patch) | |
| tree | 30e3e9c4fd505c0f235249da4c8349764947619d /gnu | |
| parent | a3f6f27bbc87d3ae169323a419916e50dd379790 (diff) | |
| download | guix-1192ae940434808560b3170107e4ce44855816c3.tar.gz guix-1192ae940434808560b3170107e4ce44855816c3.zip | |
gnu: josm: Fix formatting and install more files.
This means that JOSM appears in the GNOME Shell menu.
* gnu/packages/geo.scm (josm)[source]: Replace tab character.
[arguments]: Reduce line length, and add install-share-directories phase.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/geo.scm | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ab1d691c6c..291b928338 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz> ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020 Christopher Baines <mail@cbaines.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1290,7 +1291,7 @@ to the OSM opening hours specification.") (modules '((guix build utils))) (snippet '(begin - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.jar$")) #t)))) (build-system ant-build-system) (native-inputs @@ -1339,7 +1340,8 @@ to the OSM opening hours specification.") (filter (lambda (s) (let ((source (assoc-ref inputs "source"))) - (not (equal? (substring s 0 (string-length source)) source)))) + (not (equal? (substring s 0 (string-length source)) + source)))) (string-split (getenv "CLASSPATH") #\:)) ":")) #t)) @@ -1386,6 +1388,19 @@ to the OSM opening hours specification.") "Is-Local-Build: true\n" "Build-Date: 1970-01-01 00:00:00 +0000\n")))) #t)) + (add-after 'install 'install-share-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (share-directories '("applications" "icons" "man" "menu" + "metainfo" "mime" "pixmaps"))) + (for-each (lambda (directory) + (copy-recursively (string-append + "native/linux/tested/usr/share/" + directory) + (string-append + out "/share/" directory))) + share-directories)) + #t)) (add-after 'install 'install-bin (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |