systemd: drop 0017-meson-Don-t-link-ssh-dropins.patch

pkgs/os-specific/linux/systemd/0017-meson-Don-t-link-ssh-dropins.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marie Ramlow <me@nycode.dev>
-Date: Sun, 24 Nov 2024 20:04:35 +0100
-Subject: [PATCH] meson: Don't link ssh dropins
-
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3672005d75..406be24b45 100644
---- a/meson.build
-+++ b/meson.build
-@@ -210,13 +210,13 @@ sshconfdir = get_option('sshconfdir')
- if sshconfdir == ''
-         sshconfdir = sysconfdir / 'ssh/ssh_config.d'
- endif
--conf.set10('LINK_SSH_PROXY_DROPIN', sshconfdir != 'no' and not sshconfdir.startswith('/usr/'))
-+conf.set10('LINK_SSH_PROXY_DROPIN', 0)
- 
- sshdconfdir = get_option('sshdconfdir')
- if sshdconfdir == ''
-         sshdconfdir = sysconfdir / 'ssh/sshd_config.d'
- endif
--conf.set10('LINK_SSHD_USERDB_DROPIN', sshdconfdir != 'no' and not sshdconfdir.startswith('/usr/'))
-+conf.set10('LINK_SSHD_USERDB_DROPIN', 0)
- 
- sshdprivsepdir = get_option('sshdprivsepdir')
- conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/'))

pkgs/os-specific/linux/systemd/default.nix

@@ -242,11 +242,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./0009-add-rootprefix-to-lookup-dir-paths.patch
     ./0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
     ./0014-core-don-t-taint-on-unmerged-usr.patch
-
-    # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles
-    # if the install prefix is not /usr, but that does not work for us
-    # because we include the config snippet manually
-    ./0017-meson-Don-t-link-ssh-dropins.patch
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
     ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch