From ac70395304a1631e6260af12372260e9d7ba9dbd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 2 Jul 2023 12:53:56 +0800 Subject: [PATCH] xorg.xdm: drop outdated patch --- pkgs/servers/x11/xorg/overrides.nix | 1 - .../x11/xorg/xdm-fix-header-inclusion.patch | 29 ------------------- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/servers/x11/xorg/xdm-fix-header-inclusion.patch diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9d63228220e7..ecf4508e5829 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -164,7 +164,6 @@ self: super: }); xdm = super.xdm.overrideAttrs (attrs: { - patches = (attrs.patches or []) ++ [ ./xdm-fix-header-inclusion.patch ]; buildInputs = attrs.buildInputs ++ [ libxcrypt ]; configureFlags = attrs.configureFlags or [] ++ [ "ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp" diff --git a/pkgs/servers/x11/xorg/xdm-fix-header-inclusion.patch b/pkgs/servers/x11/xorg/xdm-fix-header-inclusion.patch deleted file mode 100644 index 7bde988aefd1..000000000000 --- a/pkgs/servers/x11/xorg/xdm-fix-header-inclusion.patch +++ /dev/null @@ -1,29 +0,0 @@ -On glibc-2.36 this fails with - - genauth.c:45:12: fatal error: bsd/stdlib.h: No such file or directory - 45 | # include - | ^~~~~~~~~~~~~~ - -This is because the file will be included if HAVE_ARC4RANDOM is true and `__linux__` is set. -However, this is wrong: arc4random is now defined in glibc-2.36 and thus stdlib.h must be included -even though HAVE_ARC4RANDOM is true. - -diff --git a/xdm/genauth.c b/xdm/genauth.c -index cd2ad61..74d0ae1 100644 ---- a/xdm/genauth.c -+++ b/xdm/genauth.c -@@ -40,13 +40,7 @@ from The Open Group. - - #include - --#ifdef HAVE_ARC4RANDOM --# ifdef __linux__ --# include --# else --# include --# endif --#endif -+#include - - #include - #define Time_t time_t