From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4NSEFuJLaWG+OwAAgWs5BA (envelope-from ) for ; Fri, 15 Oct 2021 11:37:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uOYrEuJLaWFKIwAA1q6Kng (envelope-from ) for ; Fri, 15 Oct 2021 09:37:38 +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 1BDE2330E5 for ; Fri, 15 Oct 2021 11:37:38 +0200 (CEST) Received: from localhost ([::1]:35780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbJej-0005as-6z for larch@yhetil.org; Fri, 15 Oct 2021 05:37:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbJZL-0004Rc-BW for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbJZK-0006Uj-Vn for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbJZK-0005dy-RB for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50862] [PATCH core-updates-frozen 01/19] build: qt-utils: Don't wrap .X-real files. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Oct 2021 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50862@debbugs.gnu.org Received: via spool by 50862-submit@debbugs.gnu.org id=B50862.163429029121499 (code B ref 50862); Fri, 15 Oct 2021 09:32:02 +0000 Received: (at 50862) by debbugs.gnu.org; 15 Oct 2021 09:31:31 +0000 Received: from localhost ([127.0.0.1]:38134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJYo-0005ab-L5 for submit@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:31 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:14512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJYm-0005a5-Ju for 50862@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:29 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3: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-101.mailbox.org (Postfix) with ESMTPS id 4HW1HG114YzQjgG for <50862@debbugs.gnu.org>; Fri, 15 Oct 2021 11:31:22 +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=1634290278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KhFykUdMVvf/nkJ5P5FwdXyhCLAZzvsZ4c71UztQPIA=; b=TGdwy/tmkUa2m1fxJa1BYq47AjwpvRoDPYGxTtT6VicPuEA08H7fN4QkfDwuXlimQDXNQW 6rQS7muyN+mtSr4ckXY6UgT+tu5pZYziuhXisS+6xsS8xy8EvNyCByTMVfWPFO/I181Ac6 pV6kOC5bSyVVjSnuZlk8sNZqmiFKvbM2owDmW2XuC+yuiq9Qe8J7vRi5Hxa8EveBdxvaSL 3OWEcWqxMhrZiR1OZrsX3m5Y/1psEwQPvD1RSLueBAEOJ8Xf/IOEsPcRgwHE80Y6RvJFG5 HtaX9ix9NJnS9YKSw7xxRfdMOoAxxT/L88uSlzW74P4l1PFlS7YeyAoCOPk2AA== From: Brendan Tildesley Date: Fri, 15 Oct 2021 20:29:57 +1100 Message-Id: <20211015093015.5834-2-mail@brendan.scot> In-Reply-To: <20211015093015.5834-1-mail@brendan.scot> References: <20211015093015.5834-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E566E26C 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634290658; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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:dkim-signature; bh=KhFykUdMVvf/nkJ5P5FwdXyhCLAZzvsZ4c71UztQPIA=; b=X/8QJdCWQ16IwyE96958Rekt1GqGryPT4rVmPr6+g5nGvNdUVBCkLHc9lUvSj2pkNhgsrG 1Pk/Xyr7EAWwNC5LV/Pw+WFpJ3IDISEtBnegszVw3IjIN+M9voWr6gij77AfZbYMHMyjpq x+vQVzU9OGjIEn9bUsiPf8JB2kjg1k6pk2eE4i3l0P+jdl2tYKUbwpyomUkinbDVd14e6f A+YHS+EOh7NroxgQaaOGXJqODtPV8+ssF51oZ4g2prZOiE5HX11Unn2G/bE+LrrDz0b3UG ZIgqgupNe1C22XQ+ZedmcaDgAPXUZEbC+z3gp1/nKaxRrMEvE+lS2jT9grjrkQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634290658; a=rsa-sha256; cv=none; b=fgWT9JzzpFlSOzBtkGa1KeoIHcnL8QHsoYJIPKTUDbMWL/8BVReHz86YmtGbervn/ruX5e nr+hEHyFpZjqeaMGjysBJQb8FGhbSTF1jLijD/Cd/8hbJRHnbGbfgquaT19khz5ub2i8U3 QsPBThHc63yp9LkpyaguRZsFKfZLzpQ55eMwgiGRuXj8wnFNmLepKeKilwuBJAaFcRwcH8 ScRlsEmthXtrnvjTwhGi7TPEBgyx9+dZAuGlfBzs1LShARp4Z/EC0/vgpsVNGM72qGejns n6fgyaN4syHLw+3yKtJ39nfmvDIBJnISekozHHCCSTeYjWKXl5Ud48iMXT/Zyw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b="TGdwy/tm"; 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-Migadu-Spam-Score: -0.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b="TGdwy/tm"; 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-Migadu-Queue-Id: 1BDE2330E5 X-Spam-Score: -0.92 X-Migadu-Scanner: scn1.migadu.com X-TUID: P5ZgONgqKA1n * guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped programs. This is forbidden in wrap-program now due to a738a663a99. --- guix/build/qt-utils.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..e86442b79f 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,7 +134,10 @@ add a dependency of that output on Qt." (define (find-files-to-wrap output-dir) (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))) (list (string-append output-dir "/bin") (string-append output-dir "/sbin") (string-append output-dir "/libexec") -- 2.33.0