From 6f25ed384ff82aa670571c6759b76e59c4c81a1a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 13 Sep 2022 11:27:34 -0700 Subject: [PATCH 1/2] gdm: create env.d --- srcpkgs/gdm/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 3686c70b7404..e2b2fcfc2eb9 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=42.0 -revision=1 +revision=2 build_helper="gir" build_style=meson configure_args=" @@ -10,7 +10,8 @@ configure_args=" -Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid -Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true -Dselinux=disabled -Dlibaudit=disabled - -Dsystemdsystemunitdir=/tmp -Dsystemduserunitdir=/tmp" + -Dsystemdsystemunitdir=/usr/lib/systemd/system + -Dsystemduserunitdir=/usr/lib/systemd/user" hostmakedepends="dconf gettext itstool pkg-config" makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel @@ -32,6 +33,9 @@ conf_files=" /etc/pam.d/gdm-launch-environment /etc/pam.d/gdm-password /etc/pam.d/gdm-smartcard" +make_dirs=" + /usr/share/gdm/env.d 0755 root root + /etc/gdm/env.d 0755 root root" # Create the 'gdm' system user/group. system_accounts="gdm" gdm_homedir="/var/lib/gdm" @@ -52,7 +56,6 @@ post_install() { vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f" fi done - rm -rf ${DESTDIR}/tmp # runit service vsv gdm From 46f6abaa6ea4bbdcb63d579caee9215008ea3dd5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 13 Sep 2022 11:28:55 -0700 Subject: [PATCH 2/2] flatpak: fix setting environment variables on gdm --- srcpkgs/flatpak/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index 778ab0e681d8..e9fefbf33925 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,7 +1,7 @@ # Template file for 'flatpak' pkgname=flatpak version=1.14.0 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args=" @@ -9,6 +9,7 @@ configure_args=" --with-system-dbus-proxy --with-system-helper-user=_flatpak --enable-selinux-module=no + --enable-gdm-env-file $(vopt_enable gir introspection)" hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy"