cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cdrtools: 3.02a06 -> 3.02a09

Browse source
This commit is contained in:
c0bw3b 2019-10-19 23:08:06 +02:00
parent 183b9d0957
commit 382ca30e76
3 changed files with 13 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/applications/misc/cdrtools/fix-paths.patch
View file

@ -1,32 +0,0 @@
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

18
pkgs/applications/misc/cdrtools/default.nix → pkgs/tools/cd-dvd/cdrtools/default.nix
View file

@ -1,33 +1,33 @@
{ stdenv, fetchurl, acl, libcap, Carbon, IOKit }:
{ stdenv, fetchurl, m4, acl, libcap, Carbon, IOKit }:
stdenv.mkDerivation rec {
pname = "cdrtools";
version = "3.02a06";
version = "3.02a09";
src = fetchurl {
url = "mirror://sourceforge/cdrtools/${pname}-${version}.tar.bz2";
sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd";
sha256 = "10ayj48jax2pvsv6j5gybwfsx7b74zdjj84znwag7wwf8n7l6a5a";
};
patches = [ ./fix-paths.patch ];
nativeBuildInputs = [ m4 ];
buildInputs = if stdenv.isDarwin then [ Carbon IOKit ] else [ acl libcap ];
postPatch = ''
sed "/\.mk3/d" -i libschily/Targets.man
substituteInPlace man/Makefile --replace "man4" ""
substituteInPlace RULES/rules.prg --replace "/bin/" ""
'';
dontConfigure = true;
GMAKE_NOWARN = true;
makeFlags = [ "GMAKE_NOWARN=true" "INS_BASE=/" "INS_RBASE=/" "DESTDIR=${placeholder "out"}" ];
makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ];
enableParallelBuilding = false; # parallel building fails on some linux machines
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/cdrtools/;
homepage = "http://cdrtools.sourceforge.net/private/cdrecord.html";
description = "Highly portable CD/DVD/BluRay command line recording software";
license = with licenses; [ gpl2 lgpl2 cddl ];
license = with licenses; [ cddl gpl2 lgpl21 ];
platforms = with platforms; linux ++ darwin;
# Licensing issues: This package contains code licensed under CDDL, GPL2
# and LGPL2. There is a debate regarding the legality of distributing this

8
pkgs/top-level/all-packages.nix
View file

@ -2201,6 +2201,10 @@ in
cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
cdrtools = callPackage ../tools/cd-dvd/cdrtools {
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
};
mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { };
nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
@ -17820,10 +17824,6 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon;
};
cdrtools = callPackage ../applications/misc/cdrtools {
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
};
centerim = callPackage ../applications/networking/instant-messengers/centerim { };
cgit = callPackage ../applications/version-management/git-and-tools/cgit {