From patchwork Sat Aug 13 06:54:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 41603 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 2E7D727BBEA; Sat, 13 Aug 2022 07:57:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B173B27BBE9 for ; Sat, 13 Aug 2022 07:57:49 +0100 (BST) Received: from localhost ([::1]:45800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oMl5g-0006sU-Q9 for patchwork@mira.cbaines.net; Sat, 13 Aug 2022 02:57:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oMl42-0004lt-2t for guix-patches@gnu.org; Sat, 13 Aug 2022 02:56:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oMl41-0006Xd-Q2 for guix-patches@gnu.org; Sat, 13 Aug 2022 02:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oMl41-0006sV-ML for guix-patches@gnu.org; Sat, 13 Aug 2022 02:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57168] [PATCH 04/14] gnu: lightdm-gtk-greeter: Add GDK_PIXBUF_MODULE_FILE to wrapper. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Aug 2022 06:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57168 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57168@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 57168-submit@debbugs.gnu.org id=B57168.166037371926329 (code B ref 57168); Sat, 13 Aug 2022 06:56:05 +0000 Received: (at 57168) by debbugs.gnu.org; 13 Aug 2022 06:55:19 +0000 Received: from localhost ([127.0.0.1]:59531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMl3H-0006qW-8m for submit@debbugs.gnu.org; Sat, 13 Aug 2022 02:55:19 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:33771) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMl2m-0006mC-Ps for 57168@debbugs.gnu.org; Sat, 13 Aug 2022 02:55:02 -0400 Received: by mail-qt1-f172.google.com with SMTP id cb8so2307007qtb.0 for <57168@debbugs.gnu.org>; Fri, 12 Aug 2022 23:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=SiNyWpxATwf0sF/RZTUrR5B5l8BzdgAdcDGMs+9W7NY=; b=fwlcypSPLgY+KpRvuj8NdBnQ+X5+RPpIs7EeYI71fSFvCDWz6TMjWC1qQOu9B7sB55 vDoEBqgsk1+KRd1eRzCA1ydn44wbtR8BF2Nsy00PCh15cXUvpsN25B1rMmZM/K21g9Ey HP3HuS0KsO69PmOFLgIti9raTslwVLBhuWVczAhczlTaFphwO9mmv+zAiyoEj3n6li7P JxGZAfLn69F75Nmi+IKRFwDK0DyAq8YKDi03WVJB3QNsNiD3KSny21sciQB3McgrstnB 11e9j2+UqY3jDr2wprLFDgUGL1VmemtBH11FplUWEcKybCEXKzRkhESN7veD6Vz0NUjk a2NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=SiNyWpxATwf0sF/RZTUrR5B5l8BzdgAdcDGMs+9W7NY=; b=7fco30W05uOUxPcD5lPBNt7mTtkwzV4/KkCP8mAKSHiIm6lxKtkNQ1tu0aNMHNQcS7 p5YOPwlnjg+qk24y+le4DS5G3ueJpOW0w+dtO4VqNxSz6DhIL4CsHhGg3kW4ycMHaPDs ja4emmPQL3cDgRPtlFbZ6JEaikCrCUcTWjHYrNAK9EF/1wE3NREgb6ZT4/ZVJrJpjDjt td7SaQVYSZsVvelK8my8cbqnjIAM+nmRcop3mT3RrD+DKspVNwze9D5xYI5L0AzWnjpa CbFTgJswlCqLaZ2PyWkny1kIaPqo4noemb59ED7s3BS7WQXWiFr9MugprDauuyXZsrtK 028w== X-Gm-Message-State: ACgBeo3TDgnKbExhtBY8VrQZ0UeI5gzUTr+huhSJajlUTLvNDQQqYKTD fFs/nc7mr/ILU7WDegamaOPVmG0Ax2Q= X-Google-Smtp-Source: AA6agR4SFuYwu09K2G9YlqIjh75Vy0UhnoZgfMWj0eUG7TF9DdE1M9weS3UKxCZ8+4IOKUsPO6REew== X-Received: by 2002:a05:622a:189e:b0:31e:eecb:2af7 with SMTP id v30-20020a05622a189e00b0031eeecb2af7mr6644442qtc.392.1660373683212; Fri, 12 Aug 2022 23:54:43 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-125-72.b2b2c.ca. [205.233.125.72]) by smtp.gmail.com with ESMTPSA id s12-20020a05620a29cc00b006b6757a11fcsm3734441qkp.36.2022.08.12.23.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 23:54:42 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 13 Aug 2022 02:54:23 -0400 Message-Id: <20220813065433.27319-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220813065433.27319-1-maxim.cournoyer@gmail.com> References: <20220813065433.27319-1-maxim.cournoyer@gmail.com> 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 * gnu/packages/display-managers.scm (lightdm-gtk-greeter) [build-system]: Use glib-or-gtk-build-system. [phases]{wrap-program}: Add GDK_PIXBUF_MODULE_FILE to wrapper. [inputs]: Add librsvg. --- gnu/packages/display-managers.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 6c1c5b6c25..53002f2122 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -37,6 +37,7 @@ (define-module (gnu packages display-managers) #:use-module (guix build-system cmake) #:use-module (guix build-system qt) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix utils) @@ -347,7 +348,7 @@ (define-public lightdm-gtk-greeter (sha256 (base32 "04q62mvr97l9gv8h37hfarygqc7p0498ig7xclcg4kxkqw0b7yxy")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments (list #:configure-flags @@ -376,6 +377,14 @@ (define-public lightdm-gtk-greeter (glib #$(this-package-input "glib"))) (wrap-program (search-input-file outputs "sbin/lightdm-gtk-greeter") + ;; Wrap GDK_PIXBUF_MODULE_FILE, so that the SVG loader is + ;; available at all times even outside of profiles, such as + ;; when used in the lightdm-service-type. Otherwise, it + ;; wouldn't be able to display its own icons. + `("GDK_PIXBUF_MODULE_FILE" = + (,(search-input-file + inputs + "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"))) `("XDG_DATA_DIRS" ":" prefix ,(cons "/run/current-system/profile/share" (map (lambda (pkg) @@ -388,12 +397,13 @@ (define-public lightdm-gtk-greeter (native-inputs (list exo intltool pkg-config xfce4-dev-tools)) (inputs - (list bash-minimal ;for wrap-program + (list at-spi2-core + bash-minimal ;for wrap-program + gtk+ + guile-3.0 + librsvg lightdm - shared-mime-info - at-spi2-core - glib - gtk+)) + shared-mime-info)) (synopsis "GTK+ greeter for LightDM") (home-page "https://github.com/xubuntu/lightdm-gtk-greeter") (description "This package provides a LightDM greeter implementation using