From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iMy+MsO292I3OAAAbAwnHQ (envelope-from ) for ; Sat, 13 Aug 2022 16:35:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id GCbBMsO292LuHAEA9RJhRA (envelope-from ) for ; Sat, 13 Aug 2022 16:35:47 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 79C243965C for ; Sat, 13 Aug 2022 16:35:47 +0200 (CEST) Received: from localhost ([::1]:58570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oMsEs-00046M-8M for larch@yhetil.org; Sat, 13 Aug 2022 10:35:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oMsEB-00042k-D9 for guix-patches@gnu.org; Sat, 13 Aug 2022 10:35:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45090) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oMsEB-0006VW-4q for guix-patches@gnu.org; Sat, 13 Aug 2022 10:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oMsEB-0000dL-1U for guix-patches@gnu.org; Sat, 13 Aug 2022 10:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56803] [PATCH 0/6] Add hydrus network and its dependencies Resent-From: Tomasz Jeneralczyk Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Aug 2022 14:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Maxime Devos , 56803@debbugs.gnu.org Received: via spool by 56803-submit@debbugs.gnu.org id=B56803.16604012992413 (code B ref 56803); Sat, 13 Aug 2022 14:35:02 +0000 Received: (at 56803) by debbugs.gnu.org; 13 Aug 2022 14:34:59 +0000 Received: from localhost ([127.0.0.1]:34838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMsE7-0000cr-EQ for submit@debbugs.gnu.org; Sat, 13 Aug 2022 10:34:59 -0400 Received: from outgoing1.lunanode.net ([172.81.176.235]:54583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMsE5-0000ci-KP for 56803@debbugs.gnu.org; Sat, 13 Aug 2022 10:34:58 -0400 Received: from mail1.lunanode.net (mail1.lunanode.net [170.75.162.243]) by outgoing1.lunanode.net (Postfix) with ESMTPS id EA7E740028; Sat, 13 Aug 2022 14:34:56 +0000 (UTC) MIME-Version: 1.0 Date: Sat, 13 Aug 2022 14:34:52 +0000 From: Tomasz Jeneralczyk In-Reply-To: <87lerx5u0q.fsf_-_@gnu.org> References: <8dec60b4f6d340aa63e58ef1e7628d4d8801fc0b.1658946720.git.tj@schwi.pl> <43fb4107-5ade-092c-23ef-424dfb2133c1@telenet.be> <3bdaf7497d56169b334ef85b65694fea@schwi.pl> <87lerx5u0q.fsf_-_@gnu.org> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <6db66d068f014489f5202d825e1985af@schwi.pl> X-Sender: tj@schwi.pl Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660401347; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=ZA08b7dlilyNiykr5hf59fu5Cc7E6OSbRSdn1QliVFQ=; b=Brjsbw7vRfjGZAlnOwDTJkUfMPwvSgM4iFuaYnfy/MGLTQQOr1/61hVfVUE53LXGPYwVVY WI+xd5GwgHDwitoYl9SV9JnSbVDaa86Qcq82vbYgbpi4AWqSCGSFKFvZHWs/vQA5YIrTIj 1kujd4/cdueR+LWDBXVa+QPMe5sRVYTppU1RTjUNAfFUn6Vj0DEMBaNvPOGgT80yyMlPqz vXqE4LTziqrrYwsFhJcO2f/UlsRfvvyiHCmADyHp7Dqumfm1GqVo25Mtq9/mI0GLurhd9B WO6FrpSS7+OXcTa/wfISmEAE7xUAE1//NYCtB/C83n7DhjbdBJwE8Y4Kv182DA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660401347; a=rsa-sha256; cv=none; b=J2TGXy0COEc08aCNvhFZHM1wKQnLISOnGsyi02jWIZqgUH1fOS4prZZcPV5AX6mw1Hu7Uf niV/n1I4DNO8nU9+81aj3Lr4UM5UverHuJlSpJjtmU3sY0nVHD5UfozUTCCBBIRBX8nDIk AODr5jIhnTWzm1Cz+vUjQ6t3pbcubPHDYDgTdk0zN4wFfqrHguYjGotXJOwfUMmOFq9MXH xVvQO8yi3exdReyKLsqOLWP70GG+ZNJ5UPi9fcNAIrpLlaMWz3tCJdexz8Qz1Nh6RjGqWs nkK8kCTmlSG4xkNMjtKvD3UC7hv/xvYlickF6Pmd3R8GmkufgoQ+mFEB9Y2b1A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.36 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 79C243965C X-Spam-Score: -3.36 X-Migadu-Scanner: scn0.migadu.com X-TUID: QuYct2UY0t4y On 2022-08-09 15:09, Ludovic Courtès wrote: > Perhaps these comments, or some of them, should go as comments in the > source? That will prove helpful next time you or someone else tries to > work on the package. They cluttered the code with meta-information that I didn't consider to be directly related to the package's source. Thought anyone searching would see the commit message and that would be enough. I'll add them back in if that's what you prefer. > In general, the solution here, rather than copy files like the ‘ffmpeg’ > executable, would be to patch Hydrus so that it contains the absolute > file name of ‘ffmpeg’ as returned by (search-input-file inputs > "/bin/ffmpeg"). > > How does that sound? At the time I thought that directly patching the binary paths could break some logic, but I looked into it and it looks like I only had to patch one `if` statement. This could change in future releases, but it's not likely. It appears to work as well and maybe even better - Now miniupnpc isn't timing out for me, which might or might not be because of this change. > In addition, this substitution should be done in a phase rather than in > a snippet, because (1) the result of ‘guix build -S’ should be > platform-independent and thus not include the file name of ‘mpv’ for a > particular system, and (2) the reference to variable ‘mpv’ at the top > level can cause problems due to circular dependencies among modules. I didn't know that, but it makes sense. I moved the code into its own phase. And if I understand the 2nd point correctly I should use something like `(assoc-ref inputs "mpv")` instead of `#$mpv`, right? I cannot use `(search-input-file ...)` because the name of the mpv's lib is determined during runtime by the python code and I didn't want to hardcode the mpv so file's version. After I finish making the changes I'll send the whole patchset again, it will also include updated packages to their newest release and be rebased onto current master. Thank you for taking the time to review my work.