diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-12-12 01:36:52 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-12-13 15:13:43 +0300 |
| commit | a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35 (patch) | |
| tree | a2656677d76e88c6006c067b976800708a7c53c8 /pkgs/applications/misc/cdrtools | |
| parent | c418dc84f928546bd54823a09d66f20e2b91bd7e (diff) | |
| download | nixlib-a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35.tar nixlib-a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35.tar.gz nixlib-a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35.tar.bz2 nixlib-a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35.tar.lz nixlib-a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35.tar.xz nixlib-a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35.tar.zst nixlib-a4e8b8ef066fed51e2f87ff67e7d46f9f6926e35.zip | |
cdrtools: 3.00 -> 3.02a03
Diffstat (limited to 'pkgs/applications/misc/cdrtools')
| -rw-r--r-- | pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/misc/cdrtools/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/applications/misc/cdrtools/fix-paths.patch | 32 |
3 files changed, 47 insertions, 21 deletions
diff --git a/pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch b/pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch deleted file mode 100644 index a8d93d369980..000000000000 --- a/pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN cdrtools-2.01/DEFAULTS/Defaults.linux cdrtools-2.01.new/DEFAULTS/Defaults.linux ---- cdrtools-2.01/DEFAULTS/Defaults.linux 2003-02-16 01:01:48.000000000 +0100 -+++ cdrtools-2.01.new/DEFAULTS/Defaults.linux 2005-08-30 21:13:55.000000000 +0200 -@@ -27,7 +27,8 @@ - # Installation config stuff - # - ########################################################################### --INS_BASE= /opt/schily -+#INS_BASE= /opt/schily -+INS_BASE= $(out) - INS_KBASE= / - # - DEFUMASK= 002 diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 14ab69ebd2f1..b83857b6045e 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, acl, libcap }: stdenv.mkDerivation rec { - name = "cdrtools-3.00"; - - configurePhase = "true"; + name = "cdrtools-3.02a03"; src = fetchurl { url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; - sha256 = "0ga2fdwn3898jas5mabb6cc2al9acqb2yyzph2w76m85414bd73z"; + sha256 = "02gjxib0sgzsdicnb7496x0a175w1sb34v8zc9mdi8cfw7skw996"; }; - patches = [ ./cdrtools-2.01-install.patch ]; + patches = [ ./fix-paths.patch ]; + + buildInputs = [ acl libcap ]; + + configurePhase = "true"; + + GMAKE_NOWARN = true; + + makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ]; - meta = { + meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; # Licensing issues: This package contains code licensed under CDDL, GPL2 # and LGPL2. There is debate regarding the legality of this licensing. # Marked as unfree to avoid any possible legal issues. - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/cdrtools/fix-paths.patch b/pkgs/applications/misc/cdrtools/fix-paths.patch new file mode 100644 index 000000000000..f4a541210880 --- /dev/null +++ b/pkgs/applications/misc/cdrtools/fix-paths.patch @@ -0,0 +1,32 @@ +diff -ru3 cdrtools-3.01-old/DEFAULTS/Defaults.linux cdrtools-3.01/DEFAULTS/Defaults.linux +--- cdrtools-3.01-old/DEFAULTS/Defaults.linux 2015-12-11 17:37:21.505848835 +0300 ++++ cdrtools-3.01/DEFAULTS/Defaults.linux 2015-12-11 17:37:32.155828925 +0300 +@@ -57,7 +57,8 @@ + # Installation config stuff + # + ########################################################################### +-INS_BASE= /opt/schily ++#INS_BASE= /opt/schily ++INS_BASE= $(out) + INS_KBASE= / + INS_RBASE= / + # +Only in cdrtools-3.01/DEFAULTS: Defaults.linux.orig +diff -ru3 cdrtools-3.01-old/RULES/rules.prg cdrtools-3.01/RULES/rules.prg +--- cdrtools-3.01-old/RULES/rules.prg 2015-12-11 17:37:21.500848844 +0300 ++++ cdrtools-3.01/RULES/rules.prg 2015-12-11 17:38:29.890720987 +0300 +@@ -43,10 +43,10 @@ + # + #SHELL= /bin/sh + +-LN= /bin/ln +-SYMLINK= /bin/ln -s +-RM= /bin/rm +-MV= /bin/mv ++LN= ln ++SYMLINK= ln -s ++RM= rm ++MV= mv + LORDER= lorder + TSORT= tsort + CTAGS= vctags |