mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 21:21:06 +00:00
Patch cdrdao to be compatible with the glibc 2.12
svn path=/nixpkgs/trunk/; revision=25492
This commit is contained in:
parent
3792a1ec37
commit
3905064194
15
pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
Normal file
15
pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
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>
|
|
@ -12,9 +12,13 @@ stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ lame libvorbis libmad pkgconfig libao ];
|
||||
|
||||
# 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
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i 's,linux/../,,g' dao/sg_err.h
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue