* [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files.
@ 2020-09-13 8:43 Christopher Baines
2020-09-13 10:26 ` Julien Lepiller
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Baines @ 2020-09-13 8:43 UTC (permalink / raw)
To: 43368
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 @@ 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 +1339,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 +1387,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"))
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files.
2020-09-13 8:43 [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files Christopher Baines
@ 2020-09-13 10:26 ` Julien Lepiller
2020-09-13 12:25 ` bug#43368: " Christopher Baines
0 siblings, 1 reply; 3+ messages in thread
From: Julien Lepiller @ 2020-09-13 10:26 UTC (permalink / raw)
To: Christopher Baines, 43368
[-- Attachment #1: Type: text/plain, Size: 2761 bytes --]
LGTM! Do you already have a copyright line?
Le 13 septembre 2020 04:43:23 GMT-04:00, Christopher Baines <mail@cbaines.net> a écrit :
>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 @@ 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 +1339,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 +1387,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"))
>--
>2.28.0
[-- Attachment #2: Type: text/html, Size: 3031 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#43368: [PATCH] gnu: josm: Fix formatting and install more files.
2020-09-13 10:26 ` Julien Lepiller
@ 2020-09-13 12:25 ` Christopher Baines
0 siblings, 0 replies; 3+ messages in thread
From: Christopher Baines @ 2020-09-13 12:25 UTC (permalink / raw)
To: Julien Lepiller; +Cc: 43368-done
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
Julien Lepiller <julien@lepiller.eu> writes:
> LGTM! Do you already have a copyright line?
Great, I didn't have a copyright line in this file, so I've added on and
pushed as 1192ae940434808560b3170107e4ce44855816c3.
Thanks for taking a look,
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-13 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-13 8:43 [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files Christopher Baines
2020-09-13 10:26 ` Julien Lepiller
2020-09-13 12:25 ` bug#43368: " Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).