diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 35cdb6311df32..cbe15273f424d 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -638,10 +638,7 @@ in gawk gmp gnumake gnused gnutar gnugrep gnupatch patchelf ed file ] # Library dependencies - ++ map getLib ( - [ attr acl zlib gnugrep.pcre2 libidn2 libunistring ] - ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv - ) + ++ map getLib [ attr acl zlib gnugrep.pcre2 libidn2 libunistring ] # More complicated cases ++ (map (x: getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] ) ++ [ linuxHeaders # propagated from .dev diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index d85880e82e155..6af3572c5bd75 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,6 +1,4 @@ { lib, stdenv, fetchurl -# TODO: links -lsigsegv but loses the reference for some reason -, withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv , interactive ? false, readline , autoreconfHook # no-pma fix @@ -18,11 +16,11 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; - version = "5.2.2"; + version = "5.3.0"; src = fetchurl { url = "mirror://gnu/gawk/gawk-${version}.tar.xz"; - hash = "sha256-PB/OFEa0y+4c0nO9fsZLyH2J9hU3RxzT4F4zqWWiUOk="; + hash = "sha256-ypwW09EdD/jGnXncC0cmfhMppps5t5mJVgTtRH08qQs="; }; # PIE is incompatible with the "persistent malloc" ("pma") feature. @@ -39,12 +37,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; - buildInputs = lib.optional withSigsegv libsigsegv - ++ lib.optional interactive readline + buildInputs = lib.optional interactive readline ++ lib.optional stdenv.isDarwin locale; configureFlags = [ - (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv") (if interactive then "--with-readline=${readline.dev}" else "--without-readline") ]; @@ -59,10 +55,6 @@ stdenv.mkDerivation rec { ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1 ''; - passthru = { - libsigsegv = if withSigsegv then libsigsegv else null; # for stdenv bootstrap - }; - meta = with lib; { homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language";