diff --git a/pkgs/by-name/tr/tradcpp/aarch64.patch b/pkgs/by-name/tr/tradcpp/aarch64.patch deleted file mode 100644 index ef7ad9828ace..000000000000 --- a/pkgs/by-name/tr/tradcpp/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff a/config.h b/config.h ---- a/config.h -+++ b/config.h -@@ -124,6 +124,8 @@ - #define CONFIG_CPU "__ppc64__" - #elif defined(__ARM__) - #define CONFIG_CPU "__ARM__" -+#elif defined(__aarch64__) -+#define CONFIG_CPU "__aarch64__" - #else - /* let it go */ - #endif diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix index bba9e0501e90..e7afc2c7675b 100644 --- a/pkgs/by-name/tr/tradcpp/package.nix +++ b/pkgs/by-name/tr/tradcpp/package.nix @@ -2,32 +2,29 @@ lib, stdenv, fetchurl, - autoconf, + autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tradcpp"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/${pname}-${version}.tar.gz"; - sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; + url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${finalAttrs.version}.tar.gz"; + hash = "sha256-4XufQs90s2DVaRvFn7U/N+QVgcRbdfzWS7ll5eL+TF4="; }; + # tradcpp only comes with BSD-make Makefile; the patch adds configure support + patches = [ ./tradcpp-configure.patch ]; + strictDeps = true; - # tradcpp only comes with BSD-make Makefile; the patch adds configure support - nativeBuildInputs = [ autoconf ]; - preConfigure = "autoconf"; - patches = [ - ./tradcpp-configure.patch - ./aarch64.patch - ]; - meta = with lib; { + nativeBuildInputs = [ autoreconfHook ]; + + meta = { description = "Traditional (K&R-style) C macro preprocessor"; mainProgram = "tradcpp"; - platforms = platforms.all; - license = licenses.bsd2; + platforms = lib.platforms.all; + license = lib.licenses.bsd2; }; - -} +})