From patchwork Wed Sep 7 08:47:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 15373 Received: (qmail 56349 invoked by uid 89); 7 Sep 2016 08:47:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:888 X-Spam-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 07 Sep 2016 08:47:44 +0000 Received: from localhost ([::1]:38927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhYWE-0002uJ-Ft for patchwork@sourceware.org; Wed, 07 Sep 2016 04:47:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhYW7-0002sf-Ao for guix-devel@gnu.org; Wed, 07 Sep 2016 04:47:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhYW5-0000Yo-5b for guix-devel@gnu.org; Wed, 07 Sep 2016 04:47:34 -0400 Received: from sender163-mail.zoho.com ([74.201.84.163]:24863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhYW4-0000Yc-U4 for guix-devel@gnu.org; Wed, 07 Sep 2016 04:47:33 -0400 Received: from localhost (141.80.193.18 [141.80.193.18]) by mx.zohomail.com with SMTPS id 1473238042158174.6121786721195; Wed, 7 Sep 2016 01:47:22 -0700 (PDT) From: Ricardo Wurmus To: guix-devel@gnu.org Subject: [PATCH 2/2] gnu: man-db: Patch path to iconv. Date: Wed, 7 Sep 2016 10:47:07 +0200 Message-Id: <20160907084707.11557-2-rekado@elephly.net> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160907084707.11557-1-rekado@elephly.net> References: <20160907084707.11557-1-rekado@elephly.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 74.201.84.163 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * gnu/packages/man.scm (man-db)[arguments]: Add phase "patch-iconv-path". Fixes . --- gnu/packages/man.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index a5ee2d3..8658519 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -79,7 +79,13 @@ a flexible and convenient way.") (("#! /bin/sh") (string-append "#!" (which "sh"))))) (remove file-is-directory? - (find-files "src/tests" ".*"))))))) + (find-files "src/tests" ".*")))))) + (add-after 'unpack 'patch-iconv-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/man.c" + (("\"iconv\"") + (string-append "\"" (which "iconv") "\""))) + #t))) #:configure-flags (let ((groff (assoc-ref %build-inputs "groff")) (less (assoc-ref %build-inputs "less"))