From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0pOR-0003LY-BL for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0pOP-0006ou-AT for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:48187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0pOP-0006oq-7I for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f0pOP-0007bP-3V for guix-patches@gnu.org; Tue, 27 Mar 2018 10:16:05 -0400 Subject: [bug#30960] [PATCH 2/4] gnu: font-linuxlibertine: Switch to font-build-system. Resent-Message-ID: From: Arun Isaac Date: Tue, 27 Mar 2018 19:44:39 +0530 Message-Id: <20180327141441.5713-2-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 (font-linuxlibertine): Switch to font-build-system. [arguments]: Replace system* with invoke. --- gnu/packages/fonts.scm | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 8ab3cdcf8..8252c1d72 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -305,37 +305,24 @@ The Liberation Fonts are sponsored by Red Hat.") (sha256 (base32 "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v")))) - (build-system gnu-build-system) + (build-system font-build-system) (arguments - `(#:tests? #f ; there are 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 - "')")))))) - (every (lambda (name) - (and (compile name "ttf") - (compile name "otf"))) - (find-files "." "\\.sfd$"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((font-dir (string-append (assoc-ref outputs "out") - "/share/fonts/truetype"))) - (mkdir-p font-dir) - (for-each (cut install-file <> font-dir) - (find-files "." "\\.(otf|ttf)$")) + (invoke + "fontforge" "-lang=ff" + "-c" (string-append "Open('" name "');" + "Generate('" + (basename name "sfd") ext + "')"))))) + (for-each (lambda (name) + (and (compile name "ttf") + (compile name "otf"))) + (find-files "." "\\.sfd$")) #t)))))) (native-inputs `(("fontforge" ,fontforge))) -- 2.15.1