diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b740..e2b2fcfc2eb 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