diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/tools/cd-dvd/cdrdao | |
parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/tools/cd-dvd/cdrdao')
-rw-r--r-- | nixpkgs/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch | 15 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix | 37 |
2 files changed, 52 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch new file mode 100644 index 000000000000..6d58eb6e9a56 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix new file mode 100644 index 000000000000..a17b03025032 --- /dev/null +++ b/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}: + +stdenv.mkDerivation { + name = "cdrdao-1.2.3"; + + src = fetchurl { + url = mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2; + sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; + }; + + makeFlags = "RM=rm LN=ln MV=mv"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvorbis libmad libao ]; + + hardeningDisable = [ "format" ]; + + # 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 + postPatch = '' + sed -i 's,linux/../,,g' dao/sg_err.h + ''; + + # Needed on gcc >= 6. + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + + meta = with stdenv.lib; { + description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; + homepage = http://cdrdao.sourceforge.net/; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} |