pyrox.dev
Merge pull request #229139 from bb2020/cdrdao
-15
pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
-15
pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
···
1
-
Adjust some headers for glibc 2.12 compatibility.
2
-
Patch is a diff between the 1.2.3 release and CVS HEAD.
3
-
4
-
--- cdrdao-1.2.3/dao/ScsiIf-linux.cc 2009-09-28 05:42:03.000000000 -0430
5
-
+++ /home/kkallio/q/src/r/cvs/cdrdao/cdrdao/dao/ScsiIf-linux.cc 2010-08-06 07:50:46.000000000 -0430
6
-
@@ -19,6 +19,9 @@
7
-
8
-
#include <config.h>
9
-
10
-
+#include <sys/types.h>
11
-
+#include <sys/stat.h>
12
-
+
13
-
#include <stdio.h>
14
-
#include <fcntl.h>
15
-
#include <unistd.h>
···
+2
-6
pkgs/tools/cd-dvd/cdrdao/default.nix
+2
-6
pkgs/tools/cd-dvd/cdrdao/default.nix
···
2
3
stdenv.mkDerivation rec {
4
pname = "cdrdao";
5
-
version = "1.2.3";
6
7
src = fetchurl {
8
url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2";
9
-
sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1";
10
};
11
12
makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ];
···
15
buildInputs = [ libvorbis libmad libao ];
16
17
hardeningDisable = [ "format" ];
18
-
19
-
# Adjust some headers to match glibc 2.12 ... patch is a diff between
20
-
# the cdrdao CVS head and the 1.2.3 release.
21
-
patches = [ ./adjust-includes-for-glibc-212.patch ];
22
23
# we have glibc/include/linux as a symlink to the kernel headers,
24
# and the magic '..' points to kernelheaders, and not back to the glibc/include
···
2
3
stdenv.mkDerivation rec {
4
pname = "cdrdao";
5
+
version = "1.2.5";
6
7
src = fetchurl {
8
url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2";
9
+
hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY=";
10
};
11
12
makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ];
···
15
buildInputs = [ libvorbis libmad libao ];
16
17
hardeningDisable = [ "format" ];
18
19
# we have glibc/include/linux as a symlink to the kernel headers,
20
# and the magic '..' points to kernelheaders, and not back to the glibc/include