From 4c05d5aa2cbcfa0e57b39aa695ec639e2ff71492 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Mon, 12 May 2025 21:42:41 +0200 Subject: [PATCH] dlx: unbreak, modernize Upstream is abandoned, but this is pretty trivial to fix. Breakage caused by upgrade to GCC 14: see #388196 Part of ZHF #403336 --- pkgs/by-name/dl/dlx/package.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/dl/dlx/package.nix b/pkgs/by-name/dl/dlx/package.nix index 4aa97c8efd28..5afed01df063 100644 --- a/pkgs/by-name/dl/dlx/package.nix +++ b/pkgs/by-name/dl/dlx/package.nix @@ -6,18 +6,21 @@ stdenv.mkDerivation { pname = "dlx"; - version = "2012-07-08"; + version = "0-unstable-2012-07-08"; src = fetchzip { url = "https://www.davidviner.com/zip/dlx/dlx.zip"; - sha256 = "0508linnar9ivy3xr99gzrb2l027ngx12dlxaxs7w67cnwqnb0dg"; + hash = "sha256-r4FlMbfsGH50V502EfqzRwAqVv4vpdyH3zFlZW2kCBQ="; }; - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "LINK=${stdenv.cc.targetPrefix}cc" - "CFLAGS=-O2" - ]; + preBuild = '' + makeFlagsArray+=( + CC="${stdenv.cc.targetPrefix}cc" + LINK="${stdenv.cc.targetPrefix}cc" + CFLAGS="-O2 -Wno-implicit-function-declaration" + ) + ''; + hardeningDisable = [ "format" ]; installPhase = '' @@ -28,10 +31,10 @@ stdenv.mkDerivation { mv README.txt MANUAL.TXT $out/share/dlx/doc/ ''; - meta = with lib; { + meta = { homepage = "https://www.davidviner.com/dlx.html?name=DLX+Simulator"; description = "DLX simulator written in C"; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; }; }