From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 30hABW+yXV9AZQAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 05:47:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GChnOm6yXV9QYgAAB5/wlQ (envelope-from ) for ; Sun, 13 Sep 2020 05:47:26 +0000 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 96F559402A2 for ; Sun, 13 Sep 2020 05:47:26 +0000 (UTC) Received: from localhost ([::1]:36614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKrF-0004no-IM for larch@yhetil.org; Sun, 13 Sep 2020 01:47:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqu-0004Q5-1d for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqt-00027o-Pm for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqt-0000wJ-Ob for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 5/5] qt-build-system: Don't double wrap programs. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759923542 (code B ref 43367); Sun, 13 Sep 2020 05:47:03 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:32 +0000 Received: from localhost ([127.0.0.1]:49348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqO-0000uy-A9 for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:32 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:50640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqL-0000u8-7t for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:29 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Bpz4v5mN1zKmV1 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qORu6FXXehCXwr9WEUG2YpCClc1TBn/W+Bm2zKyYZwo=; b=X6FKTJmscx+ZLs7NaKn1DUo7GVKe6xgCcrydCbASkaqpMTozWk5kxUUL32UAJbUG9OZrj+ Y5xY05TD8Ip/ju3XExXh8FyyLQAah5zabvo4WUgTlH558Uw64Cl6Zfvl1jZIlA/jp3vWY1 R5Yn7iK23yNrdjs9w3S83lZFwSJa083zGwjZ/h/GqO2SVXwp39KRNFJ05TcHb/BJ45kFdp 016MnGB/1MfxfDfEUUIzW04OdGC0lEmvHnpws7cLhmP+qXaMi9kvXpn5P8kvo/QEfJZTie Mb05NxcsAJGuUNR2gLWQWCAkh3dpnzR+1l5OCuRbdvE8qPtIXiwAZfnlerTTcA== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id S3JG-BPHjXm3 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:20 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:57 +1000 Message-Id: <20200913054557.12911-5-mail@brendan.scot> In-Reply-To: <20200913054557.12911-1-mail@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> <20200913054557.12911-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.56 / 15.00 / 15.00 X-Rspamd-Queue-Id: C99D126C X-Rspamd-UID: d90505 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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-Scanner: scn0 X-Spam-Score: 6.49 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=brendan.scot header.s=MBO0001 header.b=X6FKTJms; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam: Yes X-TUID: C2pTFtBn1dZr * guix/build/qt-build-system.scm (wrap-all-programs): Excluded wrapped programs from the list of files to wrap if they exist to avoid double wrapping. --- guix/build/qt-build-system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index 005157b0a4..4738ca09c9 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -83,7 +83,10 @@ add a dependency of that output on Qt." (define (find-files-to-wrap directory) (append-map (lambda (dir) - (if (directory-exists? dir) (find-files dir ".*") (list))) + (if (directory-exists? dir) + (find-files dir (lambda (file stat) + (not (wrapped-program? file)))) + '())) (list (string-append directory "/bin") (string-append directory "/sbin") (string-append directory "/libexec") -- 2.28.0