From 4fd304c580d3704b4f3a9955b354148b4f1d73b1 Mon Sep 17 00:00:00 2001 From: Tanel Dettenborn Date: Thu, 23 Jan 2025 01:15:33 +0200 Subject: [PATCH 1/4] screen: 4.9.1 -> 5.0.0 Rational of swithing to version v5.0.0. 4.9.1 was broken cross-compilation with GCC 14. Signed-off-by: Tanel Dettenborn --- pkgs/tools/misc/screen/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 45319b2b79a6..0ea61f0650fa 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "screen"; - version = "4.9.1"; + version = "5.0.0"; src = fetchurl { url = "mirror://gnu/screen/screen-${version}.tar.gz"; - hash = "sha256-Js7z48QlccDUhK1vrxEMXBUJH7+HKwb6eqR2bHQFrGk="; + hash = "sha256-8Eo50AoOXHyGpVM4gIkDCCrV301z3xov00JZdq7ZSXE="; }; configureFlags = [ @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { "--enable-rxvt_osc" ]; + # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416 + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU) "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; + nativeBuildInputs = [ autoreconfHook ]; From d5ea40e125589d37677f0d90b205152aade6ad79 Mon Sep 17 00:00:00 2001 From: misuzu Date: Tue, 28 Jan 2025 23:47:16 +0200 Subject: [PATCH 2/4] screen: mark as broken on darwin Disabling PAM doesn't help much. --- pkgs/tools/misc/screen/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 0ea61f0650fa..f19716bbc960 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -71,5 +71,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ ]; + # checking for PAM support... configure: error: no + broken = stdenv.hostPlatform.isDarwin; }; } From a2f04a39ea91f9f79ef8c4b0280a6a94dc7860f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Jan 2025 23:21:14 +0100 Subject: [PATCH 3/4] screen: fix darwin build --- pkgs/tools/misc/screen/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index f19716bbc960..ccfe19bbfde7 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -32,15 +32,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = - [ - ncurses - libxcrypt - ] - ++ lib.optional stdenv.hostPlatform.isLinux pam - ++ lib.optional stdenv.hostPlatform.isDarwin utmp; + buildInputs = [ + ncurses + libxcrypt + pam + ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; - doCheck = true; + # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { homepage = "https://www.gnu.org/software/screen/"; @@ -71,7 +70,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ ]; - # checking for PAM support... configure: error: no - broken = stdenv.hostPlatform.isDarwin; }; } From d0ae116eafef7444cd826bc92a57c1e4f9ac2805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Jan 2025 23:21:21 +0100 Subject: [PATCH 4/4] screen: remove unused configureFlags --- pkgs/tools/misc/screen/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index ccfe19bbfde7..3c50af1fe6bf 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-telnet" "--enable-pam" - "--with-sys-screenrc=/etc/screenrc" - "--enable-colors256" - "--enable-rxvt_osc" ]; # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416