From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 27 00:53:10 2021 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 To: 51428@debbugs.gnu.org Subject: [PATCH core-update-frozen 02/13] build: glib-or-gtk-build-system: Fix indentation. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51428 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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