From 719b14579af704b7242cb9b25f1c8eb04206a8e1 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 11 Mar 2025 07:07:41 +0100
Subject: [PATCH 1/2] dirdiff: fix build with gcc 14

---
 pkgs/by-name/di/dirdiff/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/di/dirdiff/package.nix b/pkgs/by-name/di/dirdiff/package.nix
index d49b82741c85..3923a007f3e4 100644
--- a/pkgs/by-name/di/dirdiff/package.nix
+++ b/pkgs/by-name/di/dirdiff/package.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
           --subst-var-by tcl ${tcl} \
           --subst-var-by tk ${tk}
     done
+
+    sed -i "1i #include <unistd.h>" filecmp.c
   '';
 
   env = {

From 4299329b0c42955a44dc073dac6628bd5f401211 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 11 Mar 2025 07:09:00 +0100
Subject: [PATCH 2/2] dirdiff: modernize

---
 pkgs/by-name/di/dirdiff/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/di/dirdiff/package.nix b/pkgs/by-name/di/dirdiff/package.nix
index 3923a007f3e4..518dd43baca5 100644
--- a/pkgs/by-name/di/dirdiff/package.nix
+++ b/pkgs/by-name/di/dirdiff/package.nix
@@ -8,13 +8,13 @@
   tk,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dirdiff";
   version = "2.1";
 
   src = fetchurl {
-    url = "mirror://samba/paulus/${pname}-${version}.tar.gz";
-    sha256 = "0lljd8av68j70733yshzzhxjr1lm0vgmbqsm8f02g03qsma3cdyb";
+    url = "mirror://samba/paulus/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-yzc2VNV4gCeAQ1XjVd8GlYYsO/wfaj/GAUcisxVqklI=";
   };
 
   nativeBuildInputs = [ copyDesktopItems ];
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Graphical directory tree diff and merge tool";
     mainProgram = "dirdiff";
     longDescription = ''
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
       directory trees and for merging changes from one tree into another.
     '';
     homepage = "https://www.samba.org/ftp/paulus/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
-}
+})