diff options
| author | Peng Mei Yu <i@pengmeiyu.com> | 2020-07-08 10:00:14 +0800 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2020-07-08 12:40:34 +0200 |
| commit | fa7bd6110b4b6a00dfee4f8772c5499df6696d73 (patch) | |
| tree | 1a067f49d5d0600735d7323600d22cc006a83642 /gnu/packages | |
| parent | 387bc2154430310f05865f7431070464ffb92f70 (diff) | |
| download | guix-fa7bd6110b4b6a00dfee4f8772c5499df6696d73.tar guix-fa7bd6110b4b6a00dfee4f8772c5499df6696d73.tar.gz | |
gnu: rime-data: Iterate over inputs to find Rime schemas.
* gnu/packages/ibus.scm (rime-data)[arguments]: Iterate over inputs to find
Rime schemas rather than using a pre-loaded list.
[native-inputs]: Move to ...
[inputs]: ... here.
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/ibus.scm | 45 |
1 files changed, 14 insertions, 31 deletions
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index bce907122d..d0b40a6eb2 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -363,7 +363,9 @@ traditional Chinese output.") (base32 "06ad5c4m7xsfr4if5ywshfj2aj5g5b5hwzh38dzccn7c1l2ibi0z")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests + `(#:modules ((ice-9 match) + ,@%gnu-build-system-modules) + #:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "no_update=1") #:phases @@ -376,40 +378,21 @@ traditional Chinese output.") (("^\\.DEFAULT_GOAL := preset") ".DEFAULT_GOAL := all")) #t)) - ;; Add schema packages into "package/rime" directory. - (add-after 'unpack 'add-packages + ;; Copy Rime schemas into the "package/rime" directory. + (add-after 'unpack 'copy-rime-schemas (lambda* (#:key inputs #:allow-other-keys) - (let* ((dest-dir "package/rime")) + (let ((dest-dir "package/rime")) (mkdir-p dest-dir) - (for-each (lambda (pkg) - (symlink (assoc-ref inputs - (string-append "rime-" pkg)) - (string-append dest-dir "/" pkg))) - '("array" - "bopomofo" - "cangjie" - "cantonese" - "combo-pinyin" - "double-pinyin" - "emoji" - "essay" - "ipa" - "jyutping" - "luna-pinyin" - "middle-chinese" - "pinyin-simp" - "prelude" - "quick" - "scj" - "soutzoe" - "stenotype" - "stroke" - "terra-pinyin" - "wubi" - "wugniu"))) + (for-each + (match-lambda + ((name . path) + (if (string-prefix? "rime-" name) + (let ((schema (substring name (string-length "rime-")))) + (symlink path (string-append dest-dir "/" schema)))))) + inputs)) #t)) (delete 'configure)))) - (native-inputs + (inputs `(("rime-array" ,(origin (method git-fetch) |