about summary refs log tree commit diff
path: root/pkgs/tools/cd-dvd/cdrdao/default.nix
diff options
context:
space:
mode:
authorKarn Kallio <tierpluspluslists@gmail.com>2011-01-10 14:59:24 +0000
committerKarn Kallio <tierpluspluslists@gmail.com>2011-01-10 14:59:24 +0000
commit3905064194d66dd5418520348881816a4600c429 (patch)
treedc031f76517cb0675b8bdd9a55ea9032e61e51ea /pkgs/tools/cd-dvd/cdrdao/default.nix
parent3792a1ec3770e04ab32abbe31a9bce49f3e02b46 (diff)
downloadnixlib-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
Diffstat (limited to 'pkgs/tools/cd-dvd/cdrdao/default.nix')
-rw-r--r--pkgs/tools/cd-dvd/cdrdao/default.nix6
1 files changed, 5 insertions, 1 deletions
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
   '';