unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 30960@debbugs.gnu.org
Cc: ng0@n0.is
Subject: [bug#30960] [PATCH 3/4] gnu: culmus: Switch to font-build-system.
Date: Tue, 27 Mar 2018 19:44:40 +0530	[thread overview]
Message-ID: <20180327141441.5713-3-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20180327141441.5713-1-arunisaac@systemreboot.net>

* gnu/packages/fonts.scm (culmus): Switch to font-build-system.
[arguments]: Replace system* with invoke.
---
 gnu/packages/fonts.scm | 52 +++++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 8252c1d72..dfa96b148 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1202,49 +1202,27 @@ ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold")
         (sha256
          (base32
           "1djxalm26r7bcq33ckmfa15xfs6pmqzvcl64d5lqa1dl01bl4j4z"))))
-    (build-system gnu-build-system)
+    (build-system font-build-system)
     (arguments
-     `(#:tests? #f ; no tests
-       #:modules ((guix build utils)
-                  (guix build gnu-build-system)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'build
+         (add-before 'install 'build
            (lambda _
              (let ((compile
                     (lambda (name ext)
-                      (zero? (system*
-                              "fontforge" "-lang=ff"
-                              "-c" (string-append "Open('" name "');"
-                                                  "Generate('"
-                                                  (basename name "sfd") ext
-                                                  "')"))))))
+                      (invoke
+                       "fontforge" "-lang=ff"
+                       "-c" (string-append "Open('" name "');"
+                                           "Generate('"
+                                           (basename name "sfd") ext
+                                           "')")))))
                ;; This part based on the fonts shipped in the non-source package.
-               (every (lambda (name)
-                        (compile name "ttf"))
-                      (find-files "." "^[^Nachlieli].*\\.sfd$"))
-               (every (lambda (name)
-                        (compile name "otf"))
-                      (find-files "." "^Nachlieli.*\\.sfd$"))
-               #t)))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out     (assoc-ref %outputs "out"))
-                    (ttf     (string-append out "/share/fonts/truetype"))
-                    (otf     (string-append out "/share/fonts/opentype"))
-                    (license (string-append out "/share/doc/" ,name)))
-               (for-each (lambda (file)
-                           (install-file file ttf))
-                         (find-files "." "\\.ttf$"))
-               (for-each (lambda (file)
-                           (install-file file otf))
-                         (find-files "." "\\.otf$"))
-               (for-each (lambda (file)
-                           (install-file file license))
-                         '("GNU-GPL" "LICENSE" "LICENSE-BITSTREAM"))
+               (for-each (lambda (name)
+                           (compile name "ttf"))
+                         (find-files "." "^[^Nachlieli].*\\.sfd$"))
+               (for-each (lambda (name)
+                           (compile name "otf"))
+                         (find-files "." "^Nachlieli.*\\.sfd$"))
                #t))))))
     (native-inputs
      `(("fontforge" ,fontforge)))
-- 
2.15.1

  parent reply	other threads:[~2018-03-27 14:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-27  8:49 [bug#30960] [PATCH 0/4] Switch to font-build-system Arun Isaac
2018-03-27  8:53 ` [bug#30960] [PATCH 1/4] gnu: font-lato: " Arun Isaac
2018-03-27  8:53   ` [bug#30960] [PATCH 2/4] gnu: font-linuxlibertine: " Arun Isaac
2018-03-27  8:53   ` [bug#30960] [PATCH 3/4] gnu: culmus: " Arun Isaac
2018-03-27  8:53   ` [bug#30960] [PATCH 4/4] gnu: culmus: Rename to font-culmus Arun Isaac
2018-03-27  9:08 ` [bug#30960] [PATCH 0/4] Switch to font-build-system ng0
2018-03-27 12:18   ` Arun Isaac
2018-03-27 13:47     ` ng0
2018-03-27 14:12       ` Arun Isaac
2018-03-27 14:30         ` ng0
2018-03-27 14:34           ` ng0
2018-03-27 14:36           ` ng0
2018-03-28  9:51             ` bug#30960: " Arun Isaac
2018-03-27 15:44           ` [bug#30960] " Arun Isaac
2018-03-27 16:43             ` ng0
2018-03-27 14:14 ` [bug#30960] [PATCH 1/4] gnu: font-lato: " Arun Isaac
2018-03-27 14:14   ` [bug#30960] [PATCH 2/4] gnu: font-linuxlibertine: " Arun Isaac
2018-03-27 14:14   ` Arun Isaac [this message]
2018-03-27 14:14   ` [bug#30960] [PATCH 4/4] gnu: culmus: Rename to font-culmus Arun Isaac

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=20180327141441.5713-3-arunisaac@systemreboot.net \
    --to=arunisaac@systemreboot.net \
    --cc=30960@debbugs.gnu.org \
    --cc=ng0@n0.is \
    /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).