Simon Hauser
2024-09-23 19:04:39 +02:00
parent f9cc0355f4
commit 8cd3989e4d
2 changed files with 9 additions and 19 deletions
+1 -4
View File
@@ -647,10 +647,7 @@ in
gawk gmp gnumake gnused gnutar gnugrep gnupatch patchelf ed file
]
# Library dependencies
++ map lib.getLib (
[ attr acl zlib gnugrep.pcre2 libidn2 libunistring ]
++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
)
++ map lib.getLib [ attr acl zlib gnugrep.pcre2 libidn2 libunistring ]
# More complicated cases
++ (map (x: lib.getOutput x (getLibc prevStage)) [ "out" "dev" "bin" ] )
++ [ linuxHeaders # propagated from .dev
+8 -15
View File
@@ -1,8 +1,7 @@
{ lib, stdenv, fetchurl
, removeReferencesTo
, runtimeShellPackage
# TODO: links -lsigsegv but loses the reference for some reason
, withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv
, texinfo
, interactive ? false, readline
, autoreconfHook # no-pma fix
@@ -20,11 +19,11 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
stdenv.mkDerivation rec {
pname = "gawk" + lib.optionalString interactive "-interactive";
version = "5.2.2";
version = "5.3.1";
src = fetchurl {
url = "mirror://gnu/gawk/gawk-${version}.tar.xz";
hash = "sha256-PB/OFEa0y+4c0nO9fsZLyH2J9hU3RxzT4F4zqWWiUOk=";
hash = "sha256-aU23ZIEqYjZCPU/0DOt7bExEEwG3KtUCu1wn4AzVb3g=";
};
# PIE is incompatible with the "persistent malloc" ("pma") feature.
@@ -42,6 +41,7 @@ stdenv.mkDerivation rec {
# no-pma fix
nativeBuildInputs = [
autoreconfHook
texinfo
] ++ lib.optionals interactive [
removeReferencesTo
] ++ lib.optionals (doCheck && stdenv.isLinux) [
@@ -51,14 +51,11 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals interactive [
runtimeShellPackage
readline
] ++ lib.optionals withSigsegv [
libsigsegv
] ++ lib.optionals stdenv.isDarwin [
locale
];
configureFlags = [
(if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv")
(if interactive then "--with-readline=${readline.dev}" else "--without-readline")
];
@@ -78,11 +75,7 @@ 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; {
meta = {
homepage = "https://www.gnu.org/software/gawk/";
description = "GNU implementation of the Awk programming language";
longDescription = ''
@@ -98,9 +91,9 @@ stdenv.mkDerivation rec {
makes it possible to handle many data-reformatting jobs with just a few
lines of code.
'';
license = licenses.gpl3Plus;
platforms = platforms.unix ++ platforms.windows;
maintainers = [ ];
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix ++ lib.platforms.windows;
maintainers = lib.teams.helsinki-systems.members;
mainProgram = "gawk";
};
}