cdrtools: 3.00 -> 3.02a03

+47 -21
-13
pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch
··· 1 - diff -ruN cdrtools-2.01/DEFAULTS/Defaults.linux cdrtools-2.01.new/DEFAULTS/Defaults.linux 2 - --- cdrtools-2.01/DEFAULTS/Defaults.linux 2003-02-16 01:01:48.000000000 +0100 3 - +++ cdrtools-2.01.new/DEFAULTS/Defaults.linux 2005-08-30 21:13:55.000000000 +0200 4 - @@ -27,7 +27,8 @@ 5 - # Installation config stuff 6 - # 7 - ########################################################################### 8 - -INS_BASE= /opt/schily 9 - +#INS_BASE= /opt/schily 10 - +INS_BASE= $(out) 11 - INS_KBASE= / 12 - # 13 - DEFUMASK= 002
+15 -8
pkgs/applications/misc/cdrtools/default.nix
··· 1 - { stdenv, fetchurl }: 1 + { stdenv, fetchurl, acl, libcap }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "cdrtools-3.00"; 5 - 6 - configurePhase = "true"; 4 + name = "cdrtools-3.02a03"; 7 5 8 6 src = fetchurl { 9 7 url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; 10 - sha256 = "0ga2fdwn3898jas5mabb6cc2al9acqb2yyzph2w76m85414bd73z"; 8 + sha256 = "02gjxib0sgzsdicnb7496x0a175w1sb34v8zc9mdi8cfw7skw996"; 11 9 }; 12 10 13 - patches = [ ./cdrtools-2.01-install.patch ]; 11 + patches = [ ./fix-paths.patch ]; 12 + 13 + buildInputs = [ acl libcap ]; 14 + 15 + configurePhase = "true"; 16 + 17 + GMAKE_NOWARN = true; 18 + 19 + makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ]; 14 20 15 - meta = { 21 + meta = with stdenv.lib; { 16 22 homepage = http://sourceforge.net/projects/cdrtools/; 17 23 description = "Highly portable CD/DVD/BluRay command line recording software"; 18 24 # Licensing issues: This package contains code licensed under CDDL, GPL2 19 25 # and LGPL2. There is debate regarding the legality of this licensing. 20 26 # Marked as unfree to avoid any possible legal issues. 21 - license = stdenv.lib.licenses.unfree; 27 + license = licenses.unfree; 28 + platforms = platforms.linux; 22 29 }; 23 30 }
+32
pkgs/applications/misc/cdrtools/fix-paths.patch
··· 1 + diff -ru3 cdrtools-3.01-old/DEFAULTS/Defaults.linux cdrtools-3.01/DEFAULTS/Defaults.linux 2 + --- cdrtools-3.01-old/DEFAULTS/Defaults.linux 2015-12-11 17:37:21.505848835 +0300 3 + +++ cdrtools-3.01/DEFAULTS/Defaults.linux 2015-12-11 17:37:32.155828925 +0300 4 + @@ -57,7 +57,8 @@ 5 + # Installation config stuff 6 + # 7 + ########################################################################### 8 + -INS_BASE= /opt/schily 9 + +#INS_BASE= /opt/schily 10 + +INS_BASE= $(out) 11 + INS_KBASE= / 12 + INS_RBASE= / 13 + # 14 + Only in cdrtools-3.01/DEFAULTS: Defaults.linux.orig 15 + diff -ru3 cdrtools-3.01-old/RULES/rules.prg cdrtools-3.01/RULES/rules.prg 16 + --- cdrtools-3.01-old/RULES/rules.prg 2015-12-11 17:37:21.500848844 +0300 17 + +++ cdrtools-3.01/RULES/rules.prg 2015-12-11 17:38:29.890720987 +0300 18 + @@ -43,10 +43,10 @@ 19 + # 20 + #SHELL= /bin/sh 21 + 22 + -LN= /bin/ln 23 + -SYMLINK= /bin/ln -s 24 + -RM= /bin/rm 25 + -MV= /bin/mv 26 + +LN= ln 27 + +SYMLINK= ln -s 28 + +RM= rm 29 + +MV= mv 30 + LORDER= lorder 31 + TSORT= tsort 32 + CTAGS= vctags