diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 45319b2b79a6..3c50af1fe6bf 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -11,33 +11,32 @@ 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 = [ "--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 + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU) "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; + 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/";