From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CIJtKz14fGfF2wAAe85BDQ:P1 (envelope-from ) for ; Tue, 07 Jan 2025 00:41:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CIJtKz14fGfF2wAAe85BDQ (envelope-from ) for ; Tue, 07 Jan 2025 01:41:33 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=avIWIcM1; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=U8moJEfr; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=163.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1736210493; 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=n6sIN/9pmZeds/r4A1Bv7bV4ediF8nCP+3Twgqzgke0=; b=C88Ox7y83P8eLZwcM/jeWtPjuhkfLsOJmylQVzGwX2pA7/EwloOjzNG+pz9E9DsEYj+hV+ /GKnbjeuc5LFIKWqlw2W/qjR5GgB9i5pXXCfDlY15MXdfrzpgb83gdt8RzT/Nkoy9oAmOx 4nKmM0+u56GAdwcQ+3z3zrRLYTsToD9Q/GOBF19L/i3On06OQ+KOz/k+7N0vZU3gpKBvDn SXcyOPJmGe0WyXKr0FvVrWYUDkWV7OR2HYeNA6tvNCoz6ezqaN59ez4hmvmOvNwueFeYoN skM59Pk9G0ooHTN8mxLD/gLCZGIWMYgP5rhdkKC3jVPsbMolcyGtPIf8guyDaA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=avIWIcM1; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=U8moJEfr; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=163.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1736210493; a=rsa-sha256; cv=none; b=HQi8IybkOhR/3fn2N09W+qhs17HbpxY9RW0SYRIHqCojw9F777wfklchRnuVnvGHFaWe/1 FJVcWBNMqqdbyJ6ypAkqNU0xw1pdBDW5r2faE2LYMTN3an4K2M9Bxc6WKsnpXZXRWHk3zK +s11KyWPld1DQoiHXLNRwVsbmVn+mT06d/0yCspc3E99Y1bFR6xTrjjFMDfx803FE+1bju KbNMd14nWs/PnKe5F/jAurK3fjyfGzJ7k38o6+PO1WAdPQrsE6y49J519kavvmfkYbt4Cl VXPseVx2AvpmIw1iPY0pXefhW31PQbN+HhGvwwod2R+bW9iUPz0Ne8/31mELZw== 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 22F2134B9A for ; Tue, 07 Jan 2025 01:41:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUxeg-0003Ph-Jb; Mon, 06 Jan 2025 19:41:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tUxec-0003PS-1J for guix-patches@gnu.org; Mon, 06 Jan 2025 19:41:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tUxeb-0005wz-Iu for guix-patches@gnu.org; Mon, 06 Jan 2025 19:41:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=n6sIN/9pmZeds/r4A1Bv7bV4ediF8nCP+3Twgqzgke0=; b=avIWIcM1cHmffUQRNNCv0qcwdPvk1dipupOkXJS66NcSl6k8P+HecB5CifTb51IgeaCVPE1b0IB79gKWm3dIhx2GckXEfMOZGor+UUNuVBQQOXfFi7TWV7bwTWSjljsRUda7uzI8625yxgWNped16Z24aKVaCWj46dH3i50cMG3dharlk1ktjqW9odaYaU4VmHXWShlhL9e/YC79ICcVekkOByRrPYruz4mwMMb8bKZEhGIS6qpL9dcXIvI5NqOHK+12EPFb4/6kQprzMLwOJ4QQuVqfmVD9CCqV5bhlw5XU4IZkTr2rgrtbUnOjJ4JI9huVgySDYJjuC+jXm5m54w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUxeY-0004cr-Gh; Mon, 06 Jan 2025 19:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75043] [PATCH v6] gnu: Add slick-greeter. References: <87ldw6vj2v.fsf@163.com> In-Reply-To: <87ldw6vj2v.fsf@163.com> Resent-From: tumashu@163.com Original-Sender: "Debbugs-submit" Resent-CC: tumashu@163.com, tumashu@163.com, guix-patches@gnu.org Resent-Date: Tue, 07 Jan 2025 00:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75043@debbugs.gnu.org Cc: Feng Shu , Feng Shu , tumashu@163.com X-Debbugs-Original-Xcc: Feng Shu , tumashu@163.com Received: via spool by 75043-submit@debbugs.gnu.org id=B75043.173621042517722 (code B ref 75043); Tue, 07 Jan 2025 00:41:02 +0000 Received: (at 75043) by debbugs.gnu.org; 7 Jan 2025 00:40:25 +0000 Received: from localhost ([127.0.0.1]:41070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUxdw-0004bl-Qv for submit@debbugs.gnu.org; Mon, 06 Jan 2025 19:40:25 -0500 Received: from m16.mail.163.com ([220.197.31.4]:33662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUxdr-0004Yr-98 for 75043@debbugs.gnu.org; Mon, 06 Jan 2025 19:40:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=n6sIN /9pmZeds/r4A1Bv7bV4ediF8nCP+3Twgqzgke0=; b=U8moJEfr4+l6Aw6xcBH+m 38O+KWfsoAbmG7X3c1l0JmlB9z1J3ZNwh5FxhtCGu0BjrBSVYOpsoBEU9JynEVGv TnNYhCQnYYBfWxgQ8kGMs2cawxg4pTQZ27yGuUZzbPmBGRzjUlLFpeRctCT/T9De JXZMK8BZwKcWZldPHwL/xY= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-0 (Coremail) with SMTP id _____wD3v+jrd3xnKH13EQ--.43559S2; Tue, 07 Jan 2025 08:40:11 +0800 (CST) From: tumashu@163.com Date: Tue, 7 Jan 2025 08:39:57 +0800 Message-ID: <20250107003959.70108-1-tumashu@163.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: _____wD3v+jrd3xnKH13EQ--.43559S2 X-Coremail-Antispam: 1Uf129KBjvJXoW3JrW7CryxCr4kJFWxAryxXwb_yoW7Cry8pa ySkFyrGr4DArn8XrWxW3Wagw13CF93tF4rtw13u34ay3yYkrWUZFy2qa98Ar1xGw17A3yU Wr4UXw17AFyDurJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUoCJkUUUUU= X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiRQvN1Gd8drIhGwAAsy 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 2.17 X-Spam-Score: 2.17 X-Migadu-Queue-Id: 22F2134B9A X-TUID: GXQwfUYqtlkq From: Feng Shu * gnu/packages/display-managers.scm (slick-greeter): New variable. Change-Id: I9f117bd91bfe9edbd0619f434ad46399e3c59b99 --- gnu/packages/display-managers.scm | 106 ++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index cddd3f494f..6bf055865e 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -39,6 +39,7 @@ (define-module (gnu packages display-managers) #: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 meson) #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix utils) @@ -48,9 +49,11 @@ (define-module (gnu packages display-managers) #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages cinnamon) #:use-module (gnu packages crypto) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -59,6 +62,7 @@ (define-module (gnu packages display-managers) #:use-module (gnu packages guile) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -461,6 +465,108 @@ (define make-flags* display manager which supports different greeters.") (license license:gpl3+))) +(define-public slick-greeter + (package + (name "slick-greeter") + (version "2.0.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmint/slick-greeter") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d7w0pmjl6b67bgdakg27ivl2s1kj6g9khkfwxj7bkcsgqa80931")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:configure-flags + #~(list + ;; Put the binary under /bin rather than /sbin, so that it gets + ;; wrapped by the glib-or-gtk-wrap phase. + (string-append "--sbindir=" #$output "/bin")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-hardcoded-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/slick-greeter.vala" + "src/session-list.vala" + "src/user-list.vala") + (("/usr/bin/numlockx") + (search-input-file inputs "/bin/numlockx")) + (("/usr/bin/slick-greeter-") + (string-append #$output "/bin/slick-greeter-")) + (("/usr/share/slick-greeter/badges/") + (string-append #$output "/share/slick-greeter/badges/")) + (("/usr/share/xsessions/") + "/run/current-system/profile/share/xsessions/") + (("/usr/share/wayland-sessions/") + "/run/current-system/profile/share/wayland-sessions/") + (("/usr/share/backgrounds/") + "/run/current-system/profile/share/backgrounds/")))) + (add-after 'glib-or-gtk-wrap 'custom-wrap + (lambda _ + (wrap-script (string-append #$output "/bin/slick-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" = + (,(string-append + #$output + "/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"))) + `("XDG_DATA_DIRS" ":" prefix + (,(string-append "/run/current-system/profile/share:" + (getenv "XDG_DATA_DIRS")))) + '("XCURSOR_PATH" ":" prefix + ("/run/current-system/profile/share/icons"))))) + (add-after 'install 'wrap-program + (lambda _ + (for-each + (lambda (prog) + (wrap-program (string-append #$output "/bin/" prog) + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))) + '("slick-greeter-check-hidpi" + "slick-greeter-set-keyboard-layout" + "slick-greeter-enable-tap-to-click")))) + (add-after 'install 'fix-.desktop-file + (lambda _ + (substitute* (string-append + #$output + "/share/xgreeters/slick-greeter.desktop") + (("Exec=slick-greeter") + (string-append "Exec=" + (string-append + #$output "/bin/slick-greeter"))))))))) + (native-inputs + (list gettext-minimal + (list glib "bin") + pkg-config + vala)) + (inputs + (list dbus + gtk+ + guile-3.0 + libcanberra + libgnomekbd + libxapp + libxkbfile + lightdm + numlockx + pixman + python-pygobject + python-wrapper)) + (synopsis "A slick-looking LightDM greeter") + (home-page "https://github.com/linuxmint/slick-greeter") + (description "Slick-Greeter is a fork of Unity Greeter 16.04.2, it is +cross-distribution and work pretty much anywhere, it supports HiDPI, If a +default/chosen session isn't present on the system, it will scans for known +sessions dirs and replaces the invalid session choice with a valid session.") + (license license:gpl3))) + (define-public lightdm-gtk-greeter (package (name "lightdm-gtk-greeter") -- 2.45.2