From b9ae609d63bcf1c838185167a3c74fda964067d6 Mon Sep 17 00:00:00 2001
From: bb2020 <bb2020@users.noreply.github.com>
Date: Sun, 30 Apr 2023 18:35:58 +0300
Subject: [PATCH] cdrdao: 1.2.3 -> 1.2.5

---
 .../cdrdao/adjust-includes-for-glibc-212.patch    | 15 ---------------
 pkgs/tools/cd-dvd/cdrdao/default.nix              |  8 ++------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch

diff --git a/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch b/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
deleted file mode 100644
index 6d58eb6e9a56..000000000000
--- a/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust some headers for glibc 2.12 compatibility.
-Patch is a diff between the 1.2.3 release and CVS HEAD.
-
---- cdrdao-1.2.3/dao/ScsiIf-linux.cc	2009-09-28 05:42:03.000000000 -0430
-+++ /home/kkallio/q/src/r/cvs/cdrdao/cdrdao/dao/ScsiIf-linux.cc	2010-08-06 07:50:46.000000000 -0430
-@@ -19,6 +19,9 @@
- 
- #include <config.h>
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix
index d3aa726afbb9..527d70e7a90d 100644
--- a/pkgs/tools/cd-dvd/cdrdao/default.nix
+++ b/pkgs/tools/cd-dvd/cdrdao/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cdrdao";
-  version = "1.2.3";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2";
-    sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1";
+    hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY=";
   };
 
   makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ];
@@ -16,10 +16,6 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  # Adjust some headers to match glibc 2.12 ... patch is a diff between
-  # the cdrdao CVS head and the 1.2.3 release.
-  patches = [ ./adjust-includes-for-glibc-212.patch ];
-
   # we have glibc/include/linux as a symlink to the kernel headers,
   # and the magic '..' points to kernelheaders, and not back to the glibc/include
   postPatch = ''