diff options
| author | Karn Kallio <tierpluspluslists@gmail.com> | 2011-01-10 14:59:24 +0000 |
|---|---|---|
| committer | Karn Kallio <tierpluspluslists@gmail.com> | 2011-01-10 14:59:24 +0000 |
| commit | 3905064194d66dd5418520348881816a4600c429 (patch) | |
| tree | dc031f76517cb0675b8bdd9a55ea9032e61e51ea | |
| parent | 3792a1ec3770e04ab32abbe31a9bce49f3e02b46 (diff) | |
| download | nixlib-3905064194d66dd5418520348881816a4600c429.tar nixlib-3905064194d66dd5418520348881816a4600c429.tar.gz nixlib-3905064194d66dd5418520348881816a4600c429.tar.bz2 nixlib-3905064194d66dd5418520348881816a4600c429.tar.lz nixlib-3905064194d66dd5418520348881816a4600c429.tar.xz nixlib-3905064194d66dd5418520348881816a4600c429.tar.zst nixlib-3905064194d66dd5418520348881816a4600c429.zip | |
Patch cdrdao to be compatible with the glibc 2.12
svn path=/nixpkgs/trunk/; revision=25492
| -rw-r--r-- | pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch | 15 | ||||
| -rw-r--r-- | pkgs/tools/cd-dvd/cdrdao/default.nix | 6 |
2 files changed, 20 insertions, 1 deletions
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 new file mode 100644 index 000000000000..6d58eb6e9a56 --- /dev/null +++ b/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch @@ -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> diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index e03f5f706aa6..375bbcda7e4d 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -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 ''; |