From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 1/3] gnu: mkfontdir: Do not propagate 'mkfontscale'. Date: Fri, 1 Jul 2016 12:27:28 +0300 Message-ID: <20160701092730.2265-2-alezost@gmail.com> References: <20160701092730.2265-1-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIujk-0001rM-AM for guix-devel@gnu.org; Fri, 01 Jul 2016 05:27:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIuje-000848-Q6 for guix-devel@gnu.org; Fri, 01 Jul 2016 05:27:43 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:36015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIuje-00082n-IN for guix-devel@gnu.org; Fri, 01 Jul 2016 05:27:42 -0400 Received: by mail-lf0-x241.google.com with SMTP id a2so10802144lfe.3 for ; Fri, 01 Jul 2016 02:27:40 -0700 (PDT) Received: from localhost.localdomain ([217.107.192.156]) by smtp.gmail.com with ESMTPSA id u193sm2160448lfd.36.2016.07.01.02.27.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Jul 2016 02:27:38 -0700 (PDT) In-Reply-To: <20160701092730.2265-1-alezost@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/xorg.scm (mkfontdir)[propagated-inputs]: Move 'mkfontscale' to ... [inputs]: ... here. [arguments]: Add 'wrap-mkfontdir' phase. --- gnu/packages/xorg.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 431c591..090f661 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4631,7 +4631,17 @@ protocol and arbitrary X extension protocol.") (base32 "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) (build-system gnu-build-system) - (propagated-inputs + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-mkfontdir + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/mkfontdir") + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "mkfontscale") + "/bin"))))))))) + (inputs `(("mkfontscale" ,mkfontscale))) (native-inputs `(("pkg-config" ,pkg-config))) -- 2.8.3