From patchwork Wed Sep 15 14:54:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 32850 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4194927BBE3; Wed, 15 Sep 2021 15:55:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BDD1827BBE1 for ; Wed, 15 Sep 2021 15:55:26 +0100 (BST) Received: from localhost ([::1]:49802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQWJp-0002Np-S8 for patchwork@mira.cbaines.net; Wed, 15 Sep 2021 10:55:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQWJV-0002Kj-BI for guix-patches@gnu.org; Wed, 15 Sep 2021 10:55:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQWJV-00055P-1g for guix-patches@gnu.org; Wed, 15 Sep 2021 10:55:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQWJS-0000ZY-W4 for guix-patches@gnu.org; Wed, 15 Sep 2021 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50586] [PATCH v2] gnu: mysql: Add wrapper around mysql_config. References: <20210914161025.2511106-1-zimon.toutoune@gmail.com> In-Reply-To: <20210914161025.2511106-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Sep 2021 14:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50586@debbugs.gnu.org Cc: zimoun Received: via spool by 50586-submit@debbugs.gnu.org id=B50586.16317176992173 (code B ref 50586); Wed, 15 Sep 2021 14:55:02 +0000 Received: (at 50586) by debbugs.gnu.org; 15 Sep 2021 14:54:59 +0000 Received: from localhost ([127.0.0.1]:52876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQWJL-0000Yq-Qe for submit@debbugs.gnu.org; Wed, 15 Sep 2021 10:54:59 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:43761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQWJK-0000YW-U3 for 50586@debbugs.gnu.org; Wed, 15 Sep 2021 10:54:55 -0400 Received: by mail-wr1-f46.google.com with SMTP id b6so4329335wrh.10 for <50586@debbugs.gnu.org>; Wed, 15 Sep 2021 07:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dVR89F6BmOyF+lrjVxMHnelKwP8XEf/YhrkdmLUZ/b8=; b=BNGDPverot4pwGl8jHx/odmolzfZXNcbqRr2nX5Od/GD1ag9jrIrpKkQMjLRhBME3h DiFicPCQOvwKFPr6uoLofNlcmAXASysAiZOvvD6pvycf7g/8ZpaWfsBcfLAHDwcS11ix l3yKlh4hE/LjfkFa/Elok9SN4+LmKaVmgPpqySdkXZ6hgttL2l7Kq5T1kXC8K6WyZoKV 6FlyPwYx+pdo8IlUTgrnyzes9MnPmNmBT0N1Shz+e6ZDsvgEeRwjFfhuUYWYMsT4uISS vDwyG2fwSTxZykzAhpl0jrdtOzveWX35Yo7tV4F6FbLhr+3NsXLSKB7ltDin4PJ7oZOp zGcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dVR89F6BmOyF+lrjVxMHnelKwP8XEf/YhrkdmLUZ/b8=; b=x+gRh6Dy4kkbTXeHAiY2m/7C3d2xXg11EW/5Hw9/WoOjrIr9TRJw27yPN/Q0PgvF/2 /oU5cBbO6fxujtbVDgkGWK8FxGK+FdQiofMcsX7ckkAYMQ+T38VC62ov9FcphACezI6J gqLcdDy31GADEAGyiAw03Nyo+AYxhWrIVOTLcIfKI33chqM1gRBbxwGa+BcW07l2GJEP GdsGTdPODmRbI1JuBcnJtopIbu6NUwlK/dKPtuSijzwXBxya0BHoddHNp/VlzNE3do/d LyJfcTz5yxSeqsxcxLvxh5F6xdM48xjYsC/kNq7u3b/Ug8eCCZeXqFh9rIvitJ6atped pd6Q== X-Gm-Message-State: AOAM530TbwiRv5xG0M2BOBgfTxhvjPJfdFWKbDNP6MkNmgmbqbRfGk+C 8Cc+kGxS62mDklEp8HCLZv7Essj9FF8= X-Google-Smtp-Source: ABdhPJwoBieHl4aLdtnNKb2uZHSAnDICQX8yQoeFG0igViX0OUyEmcaidnGjRMDkvZCcJkygcoMFbQ== X-Received: by 2002:a5d:4285:: with SMTP id k5mr378135wrq.131.1631717688943; Wed, 15 Sep 2021 07:54:48 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id b16sm198839wrp.82.2021.09.15.07.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 07:54:48 -0700 (PDT) From: zimoun Date: Wed, 15 Sep 2021 16:54:42 +0200 Message-Id: <20210915145442.2599256-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Fixes . * gnu/packages/databases.scm (mysql): Add phase to wrap 'mysql_config'. --- gnu/packages/databases.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c75e1421d5..1b4a1b0f12 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Alexandre Hannud Abdo +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -695,6 +697,20 @@ auto-completion and syntax highlighting.") (for-each delete-file (find-files (string-append out "/bin") "_embedded$")) + #t))) + (add-after + 'install 'wrap-mysql_config + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (awk (assoc-ref inputs "gawk")) + (coreutils (assoc-ref inputs "coreutils")) + (sed (assoc-ref inputs "sed"))) + (wrap-program (string-append bin "/mysql_config") + `("PATH" ":" suffix + (,(string-append awk "/bin") + ,(string-append coreutils "/bin") + ,(string-append sed "/bin")))) #t)))))) (native-inputs `(("bison" ,bison) @@ -702,11 +718,14 @@ auto-completion and syntax highlighting.") ("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost-for-mysql) + ("coreutils" ,coreutils) ;ls,cat required by mysql_config + ("gawk" ,gawk) ;required by mysql_config ("libaio" ,libaio) ("libtirpc" ,libtirpc) ("ncurses" ,ncurses) ("openssl" ,openssl) ("rpcsvc-proto" ,rpcsvc-proto) ; rpcgen + ("sed" ,sed) ;required by mysql_config ("zlib" ,zlib))) (home-page "https://www.mysql.com/") (synopsis "Fast, easy to use, and popular database")