From patchwork Wed Oct 27 04:51:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34081 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 6E77727BBE1; Wed, 27 Oct 2021 05:54: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 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 DE7C227BBE6 for ; Wed, 27 Oct 2021 05:54:24 +0100 (BST) Received: from localhost ([::1]:37182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxD-0001tT-Qm for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:54:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfaws-0001sF-NN for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfaws-0003nl-Ew for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfaws-00058L-CO for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 01/13] build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase. References: <87v91jcdvy.fsf@gmail.com> In-Reply-To: <87v91jcdvy.fsf@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531038319407 (code B ref 51428); Wed, 27 Oct 2021 04:54:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:03 +0000 Received: from localhost ([127.0.0.1]:48099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfavv-00052v-BH for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:03 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:37873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfavt-00052R-PH for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:02 -0400 Received: by mail-qv1-f50.google.com with SMTP id h11so976885qvk.4 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:01 -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=vC/g/xLr1mTfYLCLdAy6IbbiRpzaiWbeYpv4fWgwurU=; b=KOf+4RJ4bs4NLOmlPLDs5laY638Yzu3fwByRbLMcy0RW07wcNYzQxIJQiz55tu0zRE 210+Vs55qfr/EuUEPGqLBrvh7mTP0Sp9PHvgeCn0PTKNPgZ7o/4yMkCBpHgZrnU5JqXX Zg1qV4HWNkvzBqnRNhfA17CenOG34qoN4n0M3IGhwQabzrr8frWnKs9CGXw6q3SD01Rn 6p/B6Y78DDv/3xVxA3ozN8KhFM7HxyYa0ArEffMmVkS9R42oXYeOj3AejIEpqc9zQVQ7 MKF34/9oLe/VAQvVAyKXijUj6/i5/Pmnc3dxv48uot8dGxJQ/pItxD1f6Jg4HqieoHvO 7PZg== 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=vC/g/xLr1mTfYLCLdAy6IbbiRpzaiWbeYpv4fWgwurU=; b=JVs1McoPVzSWNgYkpgATnKJCTuNS3gLJ7a4yMTAS1cbV0BJqB5I/EfKAU7f+uxjNfw opK484UHpLarhzikJnouQB7mGgw9ZLtdtl0hM27BanylV7fwHKE+ir6+VcetA/frfpr8 05kMGI4EwQ8CLuGeRvVnGURHYIYLuC7TcQJuQMqHXBq3YMDsOBD7+jTPapiddbDt9SVi e/V+LTt0wQ04RMgVaORybV+P35NDrVNz/yXyBQFqCHT+PE+PIOeqgy3fMHw5ABzQxSIF XSbXUL2zWOiOAg3bEd8ceg8BYCYCEKxjzLQQwiKAaJFwoxpO4c6pFcHVH/qk07Ao/vEf gzRQ== X-Gm-Message-State: AOAM532Q1gwkEEOXgogIXaGIXwQvRoD8S5S/jenrBxJCOqyeOYTaCCEr HEwdOlix2/qlYRqyFZ+caNmjZfhAxlA= X-Google-Smtp-Source: ABdhPJyEFbHrzRdQ3FEBdrZRg+mjc8dGdTUPpl1qABYvsJg0mLVrm5d2Ql363GnnEdEeqlIk8lfNFg== X-Received: by 2002:a05:6214:21ac:: with SMTP id t12mr27386393qvc.18.1635310375849; Tue, 26 Oct 2021 21:52:55 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:52:55 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:32 -0400 Message-Id: <20211027045151.9889-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 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 * guix/build/glib-or-gtk-build-system.scm (wrap-all-programs) : Precisely build the list of variable specifications, rather than relying on a bunch of conditionals. --- guix/build/glib-or-gtk-build-system.scm | 59 ++++++------------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index 9f4cc09eeb..655f20cd12 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -169,52 +169,19 @@ (define handle-output (alist-cons output directory inputs))) (gio-mod-dirs (gio-module-directories (alist-cons output directory inputs))) - (data-env-var - (if (not (null? datadirs)) - `("XDG_DATA_DIRS" ":" prefix ,datadirs) - #f)) - (gtk-mod-env-var - (if (not (null? gtk-mod-dirs)) - `("GTK_PATH" ":" prefix ,gtk-mod-dirs) - #f)) - (gio-mod-env-var - (if (not (null? gio-mod-dirs)) - `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-dirs) - #f))) - (cond - ((and data-env-var gtk-mod-env-var gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var - gtk-mod-env-var - gio-mod-env-var) - bin-list)) - ((and data-env-var gtk-mod-env-var (not gio-mod-env-var)) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var - gtk-mod-env-var) - bin-list)) - ((and data-env-var (not gtk-mod-env-var) gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var - gio-mod-env-var) - bin-list)) - ((and (not data-env-var) gtk-mod-env-var gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - gio-mod-env-var - gtk-mod-env-var) - bin-list)) - ((and data-env-var (not gtk-mod-env-var) (not gio-mod-env-var)) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var) - bin-list)) - ((and (not data-env-var) gtk-mod-env-var (not gio-mod-env-var)) - (for-each (cut wrap-program <> #:sh (sh) - gtk-mod-env-var) - bin-list)) - ((and (not data-env-var) (not gtk-mod-env-var) gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - gio-mod-env-var) - bin-list)))))))) + (env-vars `(,@(if (not (null? datadirs)) + (list `("XDG_DATA_DIRS" ":" prefix ,datadirs)) + '()) + ,@(if (not (null? gtk-mod-dirs)) + (list `("GTK_PATH" ":" prefix ,gtk-mod-dirs)) + '()) + ,@(if (not (null? gio-mod-dirs)) + (list `("GIO_EXTRA_MODULES" ":" + prefix ,gio-mod-dirs)) + '())))) + (for-each (lambda (program) + (apply wrap-program program #:sh (sh) env-vars)) + bin-list)))))) (for-each handle-output outputs) #t)