From aba1241f7fba0d455b231b19266a4fdd0af58747 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 22 Dec 2024 19:13:35 +0400
Subject: [PATCH 1/2] =?UTF-8?q?dict:=201.13.1=20=E2=86=92=201.13.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/dict/buildfix.diff |  4 ++--
 pkgs/servers/dict/default.nix   | 24 ++++++++++--------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff
index e30fcb2b0380..a838a76f3c67 100644
--- a/pkgs/servers/dict/buildfix.diff
+++ b/pkgs/servers/dict/buildfix.diff
@@ -1,5 +1,5 @@
---- Makefile.in~	2011-03-06 18:52:54.000000000 +0100
-+++ Makefile.in	2014-01-29 19:04:51.384844897 +0100
+--- a/Makefile.in~	2011-03-06 18:52:54.000000000 +0100
++++ a/Makefile.in	2014-01-29 19:04:51.384844897 +0100
 @@ -123,7 +123,7 @@
  
  %: %.o
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 547c12534e94..d3c74dfab9be 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -12,13 +12,17 @@
 
 stdenv.mkDerivation rec {
   pname = "dictd";
-  version = "1.13.1";
+  version = "1.13.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
-    sha256 = "sha256-5PGmfRaJTYSUVp19yUQsFcw4wBHyuWMcfxzGInZlKhs=";
+    hash = "sha256-GSEp37OPpyP0ipWGx5xRmPxJBP7BdXF2kXMU3Qc/EXE=";
   };
 
+  patches = [
+    ./buildfix.diff
+  ];
+
   buildInputs = [
     libmaa
     zlib
@@ -34,28 +38,20 @@ stdenv.mkDerivation rec {
   # In earlier versions, parallel building was not supported but it's OK with 1.13
   enableParallelBuilding = true;
 
-  patchPhase = "patch -p0 < ${./buildfix.diff}";
-
   configureFlags = [
     "--datadir=/run/current-system/sw/share/dictd"
     "--sysconfdir=/etc"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.cc.isClang [
-      "-Wno-error=implicit-function-declaration"
-    ]
-  );
-
   postInstall = ''
     install -Dm444 -t $out/share/doc/${pname} NEWS README
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Dict protocol server and client";
     homepage = "http://www.dict.org";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 }

From 18479b84b3e035899b20390105f3494d8f5ca506 Mon Sep 17 00:00:00 2001
From: Al McElrath <hello@yrns.org>
Date: Tue, 31 Dec 2024 12:08:36 -0700
Subject: [PATCH 2/2] dict: use flex_2_5_35

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27d706ce16a6..bc89b970eb6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11492,6 +11492,7 @@ with pkgs;
   };
 
   dict = callPackage ../servers/dict {
+    flex = flex_2_5_35;
     libmaa = callPackage ../servers/dict/libmaa.nix { };
   };