From 3905064194d66dd5418520348881816a4600c429 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 10 Jan 2011 14:59:24 +0000 Subject: [PATCH] Patch cdrdao to be compatible with the glibc 2.12 svn path=/nixpkgs/trunk/; revision=25492 --- .../cdrdao/adjust-includes-for-glibc-212.patch | 15 +++++++++++++++ pkgs/tools/cd-dvd/cdrdao/default.nix | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 00000000000..6d58eb6e9a5 --- /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 + ++#include ++#include ++ + #include + #include + #include diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index e03f5f706aa..375bbcda7e4 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 '';