From: ng0 <contact.ng0@cryptolab.net>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: 25741@debbugs.gnu.org
Subject: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout.
Date: Thu, 27 Apr 2017 21:53:37 +0000 [thread overview]
Message-ID: <20170427215337.smsuh3jkuq7gw2ua@abyayala> (raw)
In-Reply-To: <8737em3ov0.fsf@elephly.net>
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
Alright, here is the reworked version.
Because it is equal to the result of the previous one, I am
positive that it works like this (the previous version did).
--
PGP and more: https://people.pragmatique.xyz/ng0/
[-- Attachment #2: 0001-gnu-kbd-Add-neo-layout.patch --]
[-- Type: text/plain, Size: 3040 bytes --]
From 0377688c2db24ca87979f362433434bafd737040 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@libertad.pw>
Date: Sun, 1 Jan 2017 16:36:27 +0000
Subject: [PATCH] gnu: kbd: Add neo layout.
* gnu/packages/linux.scm (kbd): Add neo layout.
[arguments]: Add new 'install-neo-layout' and 'add-neo-directory' phases.
[native-inputs]: Add 'kbd-neo'.
---
gnu/packages/linux.scm | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0b299f9e5..b2a552718 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1674,6 +1674,12 @@ system.")
(arguments
'(#:phases
(modify-phases %standard-phases
+ (add-before 'configure 'add-neo-directory
+ (lambda _
+ (substitute* "data/Makefile.am"
+ (("mac/all")
+ "mac/all i386/neo"))
+ #t))
(add-before 'build 'pre-build
(lambda* (#:key inputs #:allow-other-keys)
(let ((gzip (assoc-ref %build-inputs "gzip"))
@@ -1691,12 +1697,33 @@ system.")
(for-each (lambda (prog)
(wrap-program (string-append bin "/" prog)
`("PATH" ":" prefix (,bin))))
- '("unicode_start" "unicode_stop"))))))))
+ '("unicode_start" "unicode_stop")))))
+ (add-before 'install 'install-neo-layout
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((neo (assoc-ref %build-inputs "kbd-neo"))
+ (out (assoc-ref outputs "out"))
+ (neo-keymaps (string-append out "/share/keymaps/i386/neo")))
+ (mkdir-p neo-keymaps)
+ (install-file neo neo-keymaps)
+ ;; Rename the file as it includes a hash in the filename.
+ (for-each (lambda (file)
+ (rename-file file (string-append neo-keymaps "/neo.map")))
+ (find-files (string-append out "/share/keymaps")
+ "neo\\.map$"))
+ #t))))))
(inputs `(("check" ,check)
("gzip" ,gzip)
("bzip2" ,bzip2)
("pam" ,linux-pam)))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("kbd-neo"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append "https://svn.neo-layout.org/!svn/bc/"
+ "2476/linux/console/neo.map"))
+ (sha256
+ (base32
+ "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g"))))))
(home-page "ftp://ftp.kernel.org/pub/linux/utils/kbd/")
(synopsis "Linux keyboard utilities and keyboard maps")
(description
--
2.12.2
next parent reply other threads:[~2017-04-27 21:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170215164800.15907-1-contact.ng0@cryptolab.net>
[not found] ` <20170215164800.15907-2-contact.ng0@cryptolab.net>
[not found] ` <8737em3ov0.fsf@elephly.net>
2017-04-27 21:53 ` ng0 [this message]
2017-04-28 8:02 ` bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout Ricardo Wurmus
2017-04-28 9:39 ` ng0
2017-04-28 14:37 ` Ricardo Wurmus
[not found] <20170215164614.lmyymqkagvudqeq6@wasp>
2017-05-25 16:47 ` ng0
2017-05-25 18:17 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170427215337.smsuh3jkuq7gw2ua@abyayala \
--to=contact.ng0@cryptolab.net \
--cc=25741@debbugs.gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).