From 35c0d7e88423671cc96d3c552eac2b4f6b1fe8d7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 13 Sep 2020 09:31:15 +0100 Subject: 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. --- gnu/packages/geo.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ab1d691c6c..a896364c35 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1290,7 +1290,7 @@ (define-public josm (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 +1339,8 @@ (define-public josm (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 +1387,19 @@ (define-public josm "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")) -- cgit v1.2.3