From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id TQl6JoLbeGEBbwAAgWs5BA (envelope-from ) for ; Wed, 27 Oct 2021 06:54:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id wNdzIYLbeGGhdQAAbx9fmQ (envelope-from ) for ; Wed, 27 Oct 2021 04:54: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 53EC32A8B0 for ; Wed, 27 Oct 2021 06:54:26 +0200 (CEST) Received: from localhost ([::1]:37188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxF-0001uc-DP for larch@yhetil.org; Wed, 27 Oct 2021 00:54:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawt-0001sN-3m for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfaws-0003ns-Ri 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-00058T-Q5 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 02/13] build: glib-or-gtk-build-system: Fix indentation. 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.163531039019447 (code B ref 51428); Wed, 27 Oct 2021 04:54:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:10 +0000 Received: from localhost ([127.0.0.1]:48104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw1-00053U-LE for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:10 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:34723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfavz-00052u-Tb for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:08 -0400 Received: by mail-qt1-f172.google.com with SMTP id v17so1415518qtp.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:07 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=kxTm2BuRUJT1AxbkTFJu84CZf7FvLInIyrARucv90wE=; b=GIc0cTJfHT4tRsFBEw9a6lUVmF7HotbDkjJE0ykY3dqRRJqKAYCHOxZV7QMyrYYeAn 2+bK9korHHd1rxx63jYTqXK9CpL6MCd07UF/1I9lQo8TVJ82XqX0//mJgpzdHa2lJbXV 5kMZbjn9Ah4rQqkwNY4YY6cTeTY4BsqXeNTbjaoF4r0DNertqioNkE845R9e2rZJ2GMb HjjcsOOu5TYTMCSXHAEhIO59F0ysjuRA/xpzB6vcMqhnZ5epv9QPBRmMTunTs1UDEEnm 35HVsaXcPdycOeouqnRT8k2p7dlnceS68pgV1XIYzKFZ66ZDLFp4v3r7umNoG2/DI+aU IfcQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=kxTm2BuRUJT1AxbkTFJu84CZf7FvLInIyrARucv90wE=; b=DlUr10dgQWScI4LxZ5YqsZDY5XhE5tIjkJwjg6wkYURPyEFdyLEqzP89RWB9FNsUk6 92VsEEWlPLy/rHeAyCgTFcHphDo6xcG+y/qwSr//nA6iVeLz3xgHZjVmwS8N5K6eJxlh rg1r3c4yJWzGqmaX2Z4VuEsi/RCNjrZeocqGeC1mzVpAqHCfDViukdiq0d+lKcyPydF8 OjjiNqTEAxwuczTTBfm5b0J6Dsdk7fqN+8oqqL4dQ+qxB/179fsi3ASlCpPP4kU8SzPG aS4fASEG53BMsGoXMknKvyFzOknrJ3DqzqOZs72Gm1+r+l2TCYs/BXMNqENso4CXtRy5 m/cw== X-Gm-Message-State: AOAM5323rP8RUzABS6NdsuVHXu7I44izltTarSnO5u5rdtwyPAQxWeFn k9RbjJcBg8Yq9VpGxHzDhEHdl/NfUwQ= X-Google-Smtp-Source: ABdhPJy3t/xZ6LfgCUaoIdxC0fSqAS9M6yICd+m31IdK2XGPwVo5nEtAh2b57iJhvYyH2Cc+o3MEIg== X-Received: by 2002:ac8:7fcf:: with SMTP id b15mr28861491qtk.363.1635310382123; Tue, 26 Oct 2021 21:53:02 -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.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:01 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:33 -0400 Message-Id: <20211027045151.9889-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635310466; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=kxTm2BuRUJT1AxbkTFJu84CZf7FvLInIyrARucv90wE=; b=IRHZAuhoS43W0xraG0JtZRTVvCIQcKJXmHKkbLFxuNnTOk4SYuR7DS1ci97hgslxnx69bV 6BcCoNOdgl0UTUKCsjVGsXhj0tePM8N3voUZkcPT60+vMGyT2Ailckntr2Jesfe9lTymbx /ORGGXTl2onJrB54cCHxzGdUQ4Ct8BHtcNhEPcI3G6Z2QypfhLZtldmqFTJot3kFW5PP+7 1ueiqwSbiSRb/5rHK2z1ii5RuAmcJH7I8gW82WgjaF/4NCZd1JIPJwi9Ch3MlftW8Lrbar kBrs8HXMV9RjylBv7Zf+D78dA53y8Ku0oAk6wc4PYjzJR1QR+JG1cTg4BtCMHQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635310466; a=rsa-sha256; cv=none; b=QkvGF3S5fp7prmlWIlOLDRF1vROz5BPGACukeaX+AF+BaLCJd5OLIvEMs+iSg9qSkvHDsh klBiMYRNzXxxGRhd/zkjgNQNY+3dS9/akIR8+8DCiRs0ZZr3knvX1VP2/HJV59wxInxOof QJf69ubs9g8TZBtx67+HrZdZX/OTCavyZwOnD2q+QmY/o3t+DEc77zyeOhOKaEcAgYDpXX itBVPKsz2WPEVPIb2Q1yv1WD/7EQyQg5d/esPjjTuO2i4N6vypTdU1sfQPy+BPtsDQLzl9 tX6jdCYb4rOqtDkTnkRrYUIKh1sxSiZwF+yPkg+L48ImndU1UPEZ5599IsbLnw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GIc0cTJf; 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: 4.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GIc0cTJf; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 53EC32A8B0 X-Spam-Score: 4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: qt4zcJ84zhDl * guix/build/glib-or-gtk-build-system.scm (gtk-module-directories) (wrap-all-programs): Fix indentation. --- guix/build/glib-or-gtk-build-system.scm | 58 ++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index 655f20cd12..c2f814eaeb 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -63,9 +63,9 @@ (define (gtk-module-directories inputs) "")) "3.0") ((string-match "gtk\\+-2" - (or (assoc-ref inputs "gtk+") - (assoc-ref inputs "source") - "")) + (or (assoc-ref inputs "gtk+") + (assoc-ref inputs "source") + "")) "2.0") (else "4.0"))) ; We default to version 4.0. @@ -156,32 +156,32 @@ (define %sh (delay (search-input-file inputs "bin/bash"))) (define (sh) (force %sh)) (define handle-output (match-lambda - ((output . directory) - (unless (member output glib-or-gtk-wrap-excluded-outputs) - (let* ((bindir (string-append directory "/bin")) - (libexecdir (string-append directory "/libexec")) - (bin-list (filter (negate wrapped-program?) - (append (find-files bindir ".*") - (find-files libexecdir ".*")))) - (datadirs (data-directories - (alist-cons output directory inputs))) - (gtk-mod-dirs (gtk-module-directories - (alist-cons output directory inputs))) - (gio-mod-dirs (gio-module-directories - (alist-cons output directory inputs))) - (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)))))) + ((output . directory) + (unless (member output glib-or-gtk-wrap-excluded-outputs) + (let* ((bindir (string-append directory "/bin")) + (libexecdir (string-append directory "/libexec")) + (bin-list (filter (negate wrapped-program?) + (append (find-files bindir ".*") + (find-files libexecdir ".*")))) + (datadirs (data-directories + (alist-cons output directory inputs))) + (gtk-mod-dirs (gtk-module-directories + (alist-cons output directory inputs))) + (gio-mod-dirs (gio-module-directories + (alist-cons output directory inputs))) + (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) -- 2.33.1