From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0pOT-0003NW-Rn for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0pON-0006nb-W3 for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:48184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0pON-0006nX-Rh for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f0pOL-0007an-N6 for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:03 -0400 Subject: [bug#30960] [PATCH 3/4] gnu: culmus: Switch to font-build-system. Resent-Message-ID: From: Arun Isaac Date: Tue, 27 Mar 2018 19:44:40 +0530 Message-Id: <20180327141441.5713-3-arunisaac@systemreboot.net> In-Reply-To: <20180327141441.5713-1-arunisaac@systemreboot.net> References: <20180327141441.5713-1-arunisaac@systemreboot.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30960@debbugs.gnu.org Cc: ng0@n0.is * 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