From patchwork Wed Oct 6 10:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5a6L5paH5q2m?= X-Patchwork-Id: 33636 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 9769C27BBE3; Wed, 6 Oct 2021 11:47:20 +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_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, 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 1748927BBE1 for ; Wed, 6 Oct 2021 11:47:20 +0100 (BST) Received: from localhost ([::1]:59130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY4SE-0003Lt-Tb for patchwork@mira.cbaines.net; Wed, 06 Oct 2021 06:47:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY4Ry-0003LV-RY for guix-patches@gnu.org; Wed, 06 Oct 2021 06:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59368) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mY4Ry-0004Bf-FM for guix-patches@gnu.org; Wed, 06 Oct 2021 06:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mY4Ry-0005V9-Er for guix-patches@gnu.org; Wed, 06 Oct 2021 06:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47355] ekho use new method to fix datadir Resent-From: =?utf-8?b?5a6L5paH5q2m?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Oct 2021 10:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47355 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: qblade Cc: 47355@debbugs.gnu.org Received: via spool by 47355-submit@debbugs.gnu.org id=B47355.163351718821103 (code B ref 47355); Wed, 06 Oct 2021 10:47:02 +0000 Received: (at 47355) by debbugs.gnu.org; 6 Oct 2021 10:46:28 +0000 Received: from localhost ([127.0.0.1]:42681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mY4RP-0005UJ-PA for submit@debbugs.gnu.org; Wed, 06 Oct 2021 06:46:28 -0400 Received: from mail-ty1jpn01olkn0176.outbound.protection.outlook.com ([104.47.93.176]:23090 helo=JPN01-TY1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mY4RM-0005U1-KF for 47355@debbugs.gnu.org; Wed, 06 Oct 2021 06:46:26 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m9LhRy0CoVUn7viKFxS1Fe86ATkVOEiPsEYH2QX4ekQIC7zlD/BkSYtpJY6kqhsZuFI0ggCX2ahZPC26Kmo5Qz4oN2e3XVTFJUQ/WNVXjOxK9iQNkmYbFerridNw/7r8sc5/3waVw4whnokNNFSNBHhUWVvIjk6oUGYw0XU/57JevquvkQXRPfln2wve9jcMKm2o5Qu1TcYTLFktOzYld7cMGHwZbCwZvt8olJ2BFRgW/CcHEgxUIoyEv+UVl52q06was3P0XdY80ikwmaM5x+k/TKJ4cVrj7SxaTnffbU3xXJR/lqK+MhbKX1Kx9XRIxzDibxsCvKgX2aFLhkP9MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8sv4qlVvO9+ZgmDpnXdsqeeFrYI3Qrwp9PG/SMkKglo=; b=FblpEt0uqqcRmf3KEVhHJlv0kOS/I98UMV3lzG5CvE30ilav+KZAe7p2aW3pC+nfPM8GEzhmudZ607YoicfS6nHjFkE9xLmBu7PjzvLE7isajBj4FxApYAErZo2XqIkq4/0l6IbGOMvaBnu7uzMsFdiKGHCdK4s4aVS57chSVTRbWSkij0gZEmCuuHdEUwJiIBUFlCj47UCGulJx3tse6fHyoDIhWBHGymJvXr2GFi3xJslBSSxcNG/Sa9ZyLoVnBGBNyCBIcvx/0adoP5V/5eptvrPUL4KBVltIQR8n/6i6RyOFMVfhW9bWvIbe96W3FSgtibqgA15RLXqKpuNzTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8sv4qlVvO9+ZgmDpnXdsqeeFrYI3Qrwp9PG/SMkKglo=; b=c15nWVB1b/BpuPlUo6B1bSmuQ3qGWCGXT+ZUDsJin+dUqK3ReNQEIvgO/g76/yvGXhdDuZg1YZmbKtc0pk03PdwCqCxLOrOR4wFNPo5YXzxf4kiatW273p6MCKVL9yGwG67tfB1sDkTnW5cHZ7QZRj+IvJp+7BGvGuOXBttE1IFS5CECZ7wn7g5TObxtIB8BLXgAL84b8AfnwVtSvPOdyuxpfCHNawr0xjCzMlIYOvgWbb/dybKP58NKpW6FjzI18sVghojicNNT3wzJZw5eN3sOu1BHwOg3tEloDOJM8s8kjO1iyYUA3d/HkoZjRM+v6gx5m4iwEIOqZi4Aonxfog== Received: from TYCP286MB1897.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:11e::13) by TYWP286MB2233.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:172::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 10:46:17 +0000 Received: from TYCP286MB1897.JPNP286.PROD.OUTLOOK.COM ([fe80::c0f5:fa5d:f30d:8f60]) by TYCP286MB1897.JPNP286.PROD.OUTLOOK.COM ([fe80::c0f5:fa5d:f30d:8f60%4]) with mapi id 15.20.4587.018; Wed, 6 Oct 2021 10:46:17 +0000 From: =?utf-8?b?5a6L5paH5q2m?= References: Date: Wed, 06 Oct 2021 18:47:51 +0800 In-Reply-To: (qblade@protonmail.com's message of "Wed, 24 Mar 2021 01:07:18 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) X-TMN: [Dyl9EFApU2qwsR8YkzBcIAIHX2biIpV1asXq2srfwLzKP/zJq3mVFCYcBT7jTnfV] X-ClientProxiedBy: HKAPR03CA0030.apcprd03.prod.outlook.com (2603:1096:203:c9::17) To TYCP286MB1897.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:11e::13) X-Microsoft-Original-Message-ID: <877deq4eg8.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (240e:399:337:2e30:2f1:f5ff:fe18:6bb) by HKAPR03CA0030.apcprd03.prod.outlook.com (2603:1096:203:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.7 via Frontend Transport; Wed, 6 Oct 2021 10:46:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b9069c06-c5fc-4ee6-eebd-08d988b6860e X-MS-TrafficTypeDiagnostic: TYWP286MB2233: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lGMNvdpSsMXI3PU+61PRbDgtwlC+AfFxdaIqo+pTPYinLXblUF2sLoDIAfR3xqAIiks0yghFm82+wrni6HFqUTA4emhEcNybm3KIHAHVW+n5itVuu+7NwfuY4GlrMy5b3qsfgWLEx8U5h0THt9Z139gXRa3JD8eB/ti9Hve62HpQgE6DN0zboLptwzPmcPX6iusnBmJZxbxdfSaB56BcEcXH1ap//aGq4IEwl1JJHKBXUOiF0w+5uAMBaQX/N9+VhlF8dZuRdnt6cnsi8NdbrH40/Sr6g1X4ixe/dLuywidimTnG3abByowj241RpdnKZfDVzJDvxnmqenB+PBCTzICN38+ltrkwGxcKYX12eiXN5UfcoIEcbofCgHWVCNsu8FkJz1aDO63GhiQfj0KbBauajXHo+iIOuylMZHCkzxPgn7eY0muGE6n+ai25Xagw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OPPTIp0QFZAqS/tr/19MtI/eZ36BhZa1WPSuS9TdB7mRTBICPbhK5ODs+9yZ2ks+jZtnI2kl6B1IVeqnta8l7aagnghsyGdS2YFkc1NUXbslZI1zHF/KmElAIGnjxHs6aPUnAF1InqrgSD8c6Bsc8cHDUd1MKlRf7fmFMOYzVn9Sv73MpxiKsOqQ4O00mrr44DEJtX78NX2R1hIU0N6e9w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9069c06-c5fc-4ee6-eebd-08d988b6860e X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1897.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 10:46:17.0160 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWP286MB2233 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 qblade writes: > I discussed with the developers of this project. It is not recommended > to use environment variables to specify the datadir, so I switched to > hard-coded paths. Hello, I see that while the environment variable EKHO_DATA_PATH is working fine, hard-coded it may be better. Also there is a `-DEKHO_DATA_PATH='"$(datadir)/ekho-data"'` in its Makefile.am, which should work out-of-the-box without any flags, envs or patching, but it doesn't... I'll raise an issue on ekho later for this. In the meanwhile, we can use this, which is a little better than patching: What do you think? Thanks! diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index cbc46b32b4..10a4f3fa76 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -579,10 +579,12 @@ control.") ("libsndfile" ,libsndfile) ("pulseaudio" ,pulseaudio))) (build-system gnu-build-system) - (native-search-paths - (list (search-path-specification - (variable "EKHO_DATA_PATH") - (files '("share/ekho-data"))))) + (arguments + '(#:configure-flags + (let* ((datadir (string-append (assoc-ref %outputs "out") "/share")) + (ekhodatadir (string-append datadir "/ekho-data"))) + (list (simple-format #f "CXXFLAGS=-DEKHO_DATA_PATH='\"~a\"'" + ekhodatadir))))) (home-page "https://eguidedog.net/ekho.php") (synopsis "Chinese text-to-speech software") (description