about summary refs log tree commit diff
path: root/pkgs/tools/cd-dvd
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/cd-dvd')
-rw-r--r--pkgs/tools/cd-dvd/bchunk/default.nix26
-rw-r--r--pkgs/tools/cd-dvd/bootiso/default.nix61
-rw-r--r--pkgs/tools/cd-dvd/brasero/default.nix4
-rw-r--r--pkgs/tools/cd-dvd/brasero/wrapper.nix8
-rw-r--r--pkgs/tools/cd-dvd/ccd2iso/default.nix24
-rw-r--r--pkgs/tools/cd-dvd/ccd2iso/include.patch9
-rw-r--r--pkgs/tools/cd-dvd/cdi2iso/default.nix29
-rw-r--r--pkgs/tools/cd-dvd/cdimgtools/default.nix36
-rw-r--r--pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch12
-rw-r--r--pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch53
-rw-r--r--pkgs/tools/cd-dvd/cdrdao/default.nix2
-rw-r--r--pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch11
-rw-r--r--pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch204
-rw-r--r--pkgs/tools/cd-dvd/cdrkit/default.nix81
-rw-r--r--pkgs/tools/cd-dvd/cdrkit/include-path.patch9
-rw-r--r--pkgs/tools/cd-dvd/cdrtools/default.nix2
-rw-r--r--pkgs/tools/cd-dvd/cuetools/default.nix32
-rw-r--r--pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch17
-rw-r--r--pkgs/tools/cd-dvd/dvd+rw-tools/default.nix56
-rw-r--r--pkgs/tools/cd-dvd/dvd-vr/default.nix21
-rw-r--r--pkgs/tools/cd-dvd/dvdisaster/default.nix98
-rw-r--r--pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch19
-rw-r--r--pkgs/tools/cd-dvd/dvdisaster/encryption.patch19
-rw-r--r--pkgs/tools/cd-dvd/iat/default.nix23
-rw-r--r--pkgs/tools/cd-dvd/isolyzer/default.nix26
-rw-r--r--pkgs/tools/cd-dvd/isomd5sum/default.nix40
-rw-r--r--pkgs/tools/cd-dvd/lsdvd/default.nix21
-rw-r--r--pkgs/tools/cd-dvd/mdf2iso/default.nix21
-rw-r--r--pkgs/tools/cd-dvd/mkcue/default.nix24
-rw-r--r--pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch11
-rw-r--r--pkgs/tools/cd-dvd/nrg2iso/default.nix26
-rw-r--r--pkgs/tools/cd-dvd/sacd/default.nix44
-rw-r--r--pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix32
-rw-r--r--pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch13
-rw-r--r--pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch31
-rw-r--r--pkgs/tools/cd-dvd/uif2iso/default.nix26
-rw-r--r--pkgs/tools/cd-dvd/vobcopy/default.nix24
-rw-r--r--pkgs/tools/cd-dvd/vobsub2srt/default.nix28
38 files changed, 10 insertions, 1213 deletions
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
deleted file mode 100644
index 17b46536b53f..000000000000
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "bchunk";
-  version = "1.2.2";
-
-  src = fetchurl {
-    url = "http://he.fi/bchunk/${pname}-${version}.tar.gz";
-    sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
-  };
-
-  makeFlags = lib.optionals stdenv.cc.isClang [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ];
-
-  installPhase = ''
-    install -Dt $out/bin bchunk
-    install -Dt $out/share/man/man1 bchunk.1
-  '';
-
-  meta = with lib; {
-    homepage = "http://he.fi/bchunk/";
-    description = "Program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks";
-    platforms = platforms.unix;
-    license = licenses.gpl2Plus;
-    mainProgram = "bchunk";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/tools/cd-dvd/bootiso/default.nix
deleted file mode 100644
index 243989d04948..000000000000
--- a/pkgs/tools/cd-dvd/bootiso/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, fetchpatch
-, bash
-, makeWrapper
-, bc
-, jq
-, coreutils
-, util-linux
-, wimlib
-, file
-, syslinux
-, busybox
-, gnugrep # We can't use busybox's 'grep' as it doesn't support perl '-P' expressions.
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "bootiso";
-  version = "4.2.0";
-
-  src = fetchFromGitHub {
-    owner = "jsamr";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1l09d543b73r0wbpsj5m6kski8nq48lbraq1myxhidkgl3mm3d5i";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://code.opensuse.org/package/bootiso/raw/3799710e3da40c1b429ea1a2ce3896d18d08a5c5/f/syslinux-lib-root.patch";
-      sha256 = "sha256-x2EJppQsPPymSrjRwEy7mylW+2OKcGzKsKF3y7fzrB8=";
-    })
-  ];
-
-  strictDeps = true;
-  buildInputs = [ bash ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  makeFlags = [ "prefix=${placeholder "out"}" ];
-
-  postPatch = ''
-    substituteInPlace bootiso \
-      --replace "\$(basename \"\$0\")" "bootiso" \
-      --replace "/usr/share/syslinux" "${syslinux}/share/syslinux"
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/bootiso \
-      --prefix PATH : ${lib.makeBinPath [ bc jq coreutils util-linux wimlib file syslinux gnugrep busybox ]} \
-  '';
-
-  meta = with lib; {
-    description = "Script for securely creating a bootable USB device from one image file";
-    homepage = "https://github.com/jsamr/bootiso";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ muscaln ];
-    platforms = platforms.all;
-    mainProgram = "bootiso";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index c601c05cbb2e..34225dd8bd2a 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -39,6 +39,10 @@ in stdenv.mkDerivation rec {
     gappsWrapperArgs+=(--prefix PATH : "${binpath}")
   '';
 
+  env = lib.optionalAttrs stdenv.cc.isGNU {
+    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  };
+
   meta = with lib; {
     description = "Gnome CD/DVD Burner";
     homepage = "https://gitlab.gnome.org/GNOME/brasero";
diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix
index 5371e8d526b8..dc5c6fc4ad30 100644
--- a/pkgs/tools/cd-dvd/brasero/wrapper.nix
+++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix
@@ -1,11 +1,11 @@
-{ lib, symlinkJoin, brasero-original, cdrtools, libdvdcss, makeWrapper }:
+{ lib, symlinkJoin, brasero-unwrapped, cdrtools, libdvdcss, makeWrapper }:
 
 let
   binPath = lib.makeBinPath [ cdrtools ];
 in symlinkJoin {
-  name = "brasero-${brasero-original.version}";
+  name = "brasero-${brasero-unwrapped.version}";
 
-  paths = [ brasero-original ];
+  paths = [ brasero-unwrapped ];
   nativeBuildInputs = [ makeWrapper ];
 
   postBuild = ''
@@ -14,5 +14,5 @@ in symlinkJoin {
       --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdvdcss ]}/libdvdcss.so
   '';
 
-  inherit (brasero-original) meta;
+  inherit (brasero-unwrapped) meta;
 }
diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix
deleted file mode 100644
index 8606614d0186..000000000000
--- a/pkgs/tools/cd-dvd/ccd2iso/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "ccd2iso";
-  version = "0.3";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/ccd2iso/ccd2iso-${version}.tar.gz";
-    sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q";
-  };
-
-  patches = [
-    ./include.patch
-  ];
-
-  meta = with lib; {
-    description = "CloneCD to ISO converter";
-    homepage = "https://sourceforge.net/projects/ccd2iso/";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-    platforms = platforms.unix;
-    mainProgram = "ccd2iso";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/ccd2iso/include.patch b/pkgs/tools/cd-dvd/ccd2iso/include.patch
deleted file mode 100644
index d7c05f701ccd..000000000000
--- a/pkgs/tools/cd-dvd/ccd2iso/include.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/ccd2iso.c	2024-06-16 09:01:37
-+++ b/src/ccd2iso.c	2024-06-16 09:01:49
-@@ -27,6 +27,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "clonecd.h"
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
deleted file mode 100644
index c6c4c3f3ab35..000000000000
--- a/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "cdi2iso";
-  version = "0.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/cdi2iso.berlios/${pname}-${version}-src.tar.gz";
-    sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
-  };
-
-  postPatch = ''
-    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp cdi2iso $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Very simple utility for converting DiscJuggler images to the standard ISO-9660 format";
-    homepage = "https://sourceforge.net/projects/cdi2iso.berlios";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ hrdinka ];
-    platforms = platforms.all;
-    mainProgram = "cdi2iso";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix
deleted file mode 100644
index 37951654c7b9..000000000000
--- a/pkgs/tools/cd-dvd/cdimgtools/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }:
-
-stdenv.mkDerivation {
-  pname = "cdimgtools";
-  version = "0.3";
-
-  src = fetchFromRepoOrCz {
-    repo = "cdimgtools";
-    rev = "version/0.3";
-    hash = "sha256-HFlXGmi6YcYP+ZAdu79lJHLBmtMEhW17gs4I2ekbr8M=";
-  };
-
-  nativeBuildInputs = [ autoreconfHook makeWrapper asciidoc perlPackages.PodPerldoc xmlto sourceHighlight docbook_xsl docbook_xml_dtd_45 ];
-
-  buildInputs = [ perl perlPackages.StringEscape perlPackages.DataHexdumper libdvdcss libdvdread ];
-
-  patches = [ ./nrgtool_fix_my.patch ./removed_dvdcss_interface_2.patch];
-
-  postFixup = ''
-    for cmd in raw96cdconv nrgtool; do
-      wrapProgram "$out/bin/$cmd" --prefix PERL5LIB : "$PERL5LIB"
-    done
-  '';
-
-  outputs = [ "out" "doc" ];
-
-  installTargets = [ "install" "install-doc" ];
-
-  meta = with lib; {
-    homepage = "https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html";
-    description = "Tools to inspect and manipulate CD/DVD optical disc images";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ hhm ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch
deleted file mode 100644
index 5ed389c46ca2..000000000000
--- a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fixes an error in nrgtool.
---- a/nrgtool
-+++ b/nrgtool
-@@ -162,7 +162,7 @@ sub process_file {
- 	}
- 	seek $nrg, 0, SEEK_SET if ($iff_only);
- 	seek $nrg, $offset, SEEK_SET unless ($iff_only);
--	while (my $_ = read_chunk($nrg, $iff)) {
-+	while ($_ = read_chunk($nrg, $iff)) {
- 		if ($_ < -1) {
- 			warn  "ERROR while reading an IFF chunk; aborting\n";
- 			return;
diff --git a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch
deleted file mode 100644
index cb265eae05bf..000000000000
--- a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Removes the deprecated and removed `dvdcss_interface_2` libdvdcss function.
-
-This does not change any functionality; it only modifies the printing of software version information.
---- a/cssdec.c
-+++ b/cssdec.c
-@@ -102,8 +102,8 @@ int main( int argc, char *argv[] )
- 			b_keyonly = 1;
- 			break;
- 		case 'V':
--			printf( "%s version %s (libdvdcss version %s)\n",
--			  progname, progversion, dvdcss_interface_2 );
-+			printf( "%s version %s\n",
-+			  progname, progversion );
- 			exit( EX_SUCCESS );
- 			break;
- 		case '?':
-@@ -126,8 +126,8 @@ int main( int argc, char *argv[] )
- 	if( argc >= 3 ) end = (int)strtol( argv[2], (char **)NULL, 0 );
- 
- 	/* Initialize libdvdcss */
--	printe( 2, "%s version %s (libdvdcss version %s)",
--	  progname, progversion, dvdcss_interface_2 );
-+	printe( 2, "%s version %s",
-+	  progname, progversion );
- 	dvdcss = dvdcss_open( (char *)dvdfile );
- 	if( dvdcss == NULL )
- 	{
-diff --git a/dvdimgdecss.c b/dvdimgdecss.c
-index 0b7006d..b7d251a 100644
---- a/dvdimgdecss.c
-+++ b/dvdimgdecss.c
-@@ -157,8 +157,8 @@ int main( int argc, char *argv[] )
- 			dvdread_decrypt = 1;
- 			break;
- 		case 'V':
--			printf( "%s version %s (libdvdcss version %s)\n",
--			  progname, progversion, dvdcss_interface_2 );
-+			printf( "%s version %s\n",
-+			  progname, progversion );
- 			exit( EX_SUCCESS );
- 			break;
- 		case '?':
-@@ -180,8 +180,8 @@ int main( int argc, char *argv[] )
- 	if( !imgfile ) verbosity++;
- 
- 	/* Open the DVD */
--	printe( 2, "%s: version %s (libdvdcss version %s)\n",
--	  progname, progversion, dvdcss_interface_2 );
-+	printe( 2, "%s: version %s\n",
-+	  progname, progversion );
- 	dvdcss = dvdcss_open( dvdfile );
- 	if( dvdcss == NULL ) {
- 		printe( 1, "opening of the DVD (%s) with libdvdcss failed\n", dvdfile );
diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix
index 84cad2a5d96d..b4e93adce864 100644
--- a/pkgs/tools/cd-dvd/cdrdao/default.nix
+++ b/pkgs/tools/cd-dvd/cdrdao/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     libvorbis
     libmad
     libao
-  ] ++ lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     CoreServices
     IOKit
   ];
diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch b/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch
deleted file mode 100644
index c7db796cfcfc..000000000000
--- a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/genisoimage/genisoimage.h
-+++ b/genisoimage/genisoimage.h
-@@ -377,7 +377,7 @@ extern int	use_fileversion;
- extern int	split_SL_component;
- extern int	split_SL_field;
- extern char	*trans_tbl;
--char		*outfile;
-+extern char	*outfile;
- 
- #define	JMAX		64	/* maximum Joliet file name length (spec) */
- #define	JLONGMAX	103	/* out of spec Joliet file name length */
diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch b/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
deleted file mode 100644
index 45f910b03e66..000000000000
--- a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff --git a/doc/icedax/tracknames.pl b/doc/icedax/tracknames.pl
-old mode 100755
-new mode 100644
-index 09f0fcf..801b89e
---- a/doc/icedax/tracknames.pl
-+++ b/doc/icedax/tracknames.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl 
-+#!/usr/bin/perl 
- # A quick perl hack to get rename files pulled in with icedax.
- # by billo@billo.com
- #
-diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c
-index b97bdf1..5d7c2d1 100644
---- a/genisoimage/eltorito.c
-+++ b/genisoimage/eltorito.c
-@@ -59,7 +59,7 @@ static	void	get_torito_desc(struct eltorito_boot_descriptor *boot_desc);
- static	void	fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry,
- 										struct eltorito_boot_entry_info *boot_entry);
- void	get_boot_entry(void);
--void	new_boot_entry(void);
-+void	new_boot_entry();
- static	int	tvd_write(FILE *outfile);
- 
- 
-@@ -283,6 +283,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- 	int			i;
- 	int			offset;
- 	struct eltorito_defaultboot_entry boot_desc_record;
-+	struct eltorito_sectionheader_entry section_header;
- 
- 	memset(boot_desc, 0, sizeof (*boot_desc));
- 	boot_desc->type[0] = 0;
-@@ -317,7 +318,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- 	 */
- 	memset(&valid_desc, 0, sizeof (valid_desc));
- 	valid_desc.headerid[0] = 1;
--	valid_desc.arch[0] = EL_TORITO_ARCH_x86;
-+	valid_desc.arch[0] = first_boot_entry->arch;
- 
- 	/*
- 	 * we'll shove start of publisher id into id field,
-@@ -347,10 +348,53 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- 	/* now write it to the virtual boot catalog */
- 	memcpy(de2->table, &valid_desc, 32);
- 
--	for (current_boot_entry = first_boot_entry, offset = sizeof (valid_desc);
--		current_boot_entry != NULL;
--		current_boot_entry = current_boot_entry->next,
--		offset += sizeof (boot_desc_record)) {
-+	/* Fill the first entry, since it's special and already has the
-+	 * matching header via the validation header... */
-+	offset = sizeof (valid_desc);
-+	current_boot_entry = first_boot_entry;
-+
-+	if (offset >= SECTOR_SIZE) {
-+#ifdef	USE_LIBSCHILY
-+		comerrno(EX_BAD, "Too many El Torito boot entries\n");
-+#else
-+		fprintf(stderr,	"Too many El Torito boot entries\n");
-+		exit(1);
-+#endif
-+	}
-+	fill_boot_desc(&boot_desc_record, current_boot_entry);
-+	memcpy(de2->table + offset, &boot_desc_record,
-+				sizeof (boot_desc_record));
-+
-+	offset += sizeof(boot_desc_record);
-+
-+	for (current_boot_entry = current_boot_entry->next;
-+			current_boot_entry != NULL;
-+			current_boot_entry = current_boot_entry->next) {
-+		struct eltorito_sectionheader_entry section_header;
-+
-+		if (offset >= SECTOR_SIZE) {
-+#ifdef	USE_LIBSCHILY
-+			comerrno(EX_BAD,
-+			"Too many El Torito boot entries\n");
-+#else
-+			fprintf(stderr,
-+			"Too many El Torito boot entries\n");
-+			exit(1);
-+#endif
-+		}
-+
-+		memset(&section_header, '\0', sizeof(section_header));
-+		if (current_boot_entry->next)
-+			section_header.headerid[0] = EL_TORITO_SECTION_HEADER;
-+		else
-+			section_header.headerid[0] = EL_TORITO_LAST_SECTION_HEADER;
-+
-+		section_header.arch[0] = current_boot_entry->arch;
-+		set_721(section_header.num_entries, 1);
-+
-+		memcpy(de2->table + offset, &section_header,
-+					sizeof(section_header));
-+		offset += sizeof(section_header);
- 
- 		if (offset >= SECTOR_SIZE) {
- #ifdef	USE_LIBSCHILY
-@@ -365,6 +409,8 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
- 		fill_boot_desc(&boot_desc_record, current_boot_entry);
- 		memcpy(de2->table + offset, &boot_desc_record,
- 					sizeof (boot_desc_record));
-+		offset += sizeof (boot_desc_record);
-+
- 	}
- }/* get_torito_desc(... */
- 
-diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c
-index a5b0b46..8add1ac 100644
---- a/genisoimage/genisoimage.c
-+++ b/genisoimage/genisoimage.c
-@@ -47,6 +47,7 @@
- 
- #include <mconfig.h>
- #include "genisoimage.h"
-+#include "iso9660.h"
- #include <errno.h>
- #include <timedefs.h>
- #include <fctldefs.h>
-@@ -523,6 +524,8 @@ static const struct ld_option ld_options[] =
- 	'\0', NULL, "Set debug flag", ONE_DASH},
- 	{{"eltorito-boot", required_argument, NULL, 'b'},
- 	'b', "FILE", "Set El Torito boot image name", ONE_DASH},
-+	{{"efi-boot", required_argument, NULL, 'e'},
-+	'e', "FILE", "Set EFI boot image name", ONE_DASH},
- 	{{"eltorito-alt-boot", no_argument, NULL, OPTION_ALT_BOOT},
- 	'\0', NULL, "Start specifying alternative El Torito boot parameters", ONE_DASH},
- 	{{"sparc-boot", required_argument, NULL, 'B'},
-@@ -1502,6 +1505,7 @@ int main(int argc, char *argv[])
- 			all_files = 0;
- 			break;
- 		case 'b':
-+		case 'e':
- 			do_sort++;		/* We sort bootcat/botimage */
- 			use_eltorito++;
- 			boot_image = optarg;	/* pathname of the boot image */
-@@ -1517,6 +1521,10 @@ int main(int argc, char *argv[])
- #endif
- 			}
- 			get_boot_entry();
-+			if (c == 'e')
-+				current_boot_entry->arch = EL_TORITO_ARCH_EFI;
-+			else
-+				current_boot_entry->arch = EL_TORITO_ARCH_x86;
- 			current_boot_entry->boot_image = boot_image;
- 			break;
- 		case OPTION_ALT_BOOT:
-diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h
-index bbedfb0..76e5e21 100644
---- a/genisoimage/genisoimage.h
-+++ b/genisoimage/genisoimage.h
-@@ -293,6 +293,7 @@ struct deferred_write {
- struct eltorito_boot_entry_info {
- 	struct eltorito_boot_entry_info *next;
- 	char		*boot_image;
-+	char		arch;
- 	int		not_bootable;
- 	int		no_emul_boot;
- 	int		hard_disk_boot;
-diff --git a/genisoimage/iso9660.h b/genisoimage/iso9660.h
-index c74c2a9..c8b7a05 100644
---- a/genisoimage/iso9660.h
-+++ b/genisoimage/iso9660.h
-@@ -62,10 +62,14 @@ struct iso_volume_descriptor {
- #define	EL_TORITO_ARCH_x86	0
- #define	EL_TORITO_ARCH_PPC	1
- #define	EL_TORITO_ARCH_MAC	2
-+#define	EL_TORITO_ARCH_EFI	0xef
- 
- #define	EL_TORITO_BOOTABLE	0x88
- #define	EL_TORITO_NOT_BOOTABLE	0
- 
-+#define	EL_TORITO_SECTION_HEADER	0x90
-+#define	EL_TORITO_LAST_SECTION_HEADER	0x91
-+
- #define	EL_TORITO_MEDIA_NOEMUL	0
- #define	EL_TORITO_MEDIA_12FLOP	1
- #define	EL_TORITO_MEDIA_144FLOP	2
-@@ -173,7 +177,7 @@ struct eltorito_validation_entry {
- struct eltorito_defaultboot_entry {
- 	char boot_id			[ISODCL(1,    1)]; /* 711 */
- 	char boot_media			[ISODCL(2,    2)];
--	char loadseg			[ISODCL(3,    4)]; /* 711 */
-+	char loadseg			[ISODCL(3,    4)]; /* 712 */
- 	char sys_type			[ISODCL(5,    5)];
- 	char pad1			[ISODCL(6,    6)];
- 	char nsect			[ISODCL(7,    8)];
-@@ -181,6 +185,14 @@ struct eltorito_defaultboot_entry {
- 	char pad2			[ISODCL(13,  32)];
- };
- 
-+/* El Torito Section Header Entry in boot catalog */
-+struct eltorito_sectionheader_entry {
-+	char headerid			[ISODCL(1,    1)]; /* 711 */
-+	char arch			[ISODCL(2,    2)];
-+	char num_entries		[ISODCL(3,    4)]; /* 711 */
-+	char id				[ISODCL(5,   32)];
-+};
-+
- /*
-  * XXX JS: The next two structures have odd lengths!
-  * Some compilers (e.g. on Sun3/mc68020) padd the structures to even length.
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
deleted file mode 100644
index ae4a06bb57f2..000000000000
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl, iconv, darwin}:
-
-stdenv.mkDerivation rec {
-  pname = "cdrkit";
-  version = "1.1.11";
-
-  src = fetchurl {
-    url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz";
-    sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ zlib bzip2 perl ] ++
-    lib.optionals stdenv.isLinux [ libcap ] ++
-    lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]);
-
-  hardeningDisable = [ "format" ];
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [
-    "-D__THROW="
-  ] ++ lib.optionals stdenv.cc.isClang [
-    "-Wno-error=int-conversion"
-    "-Wno-error=implicit-function-declaration"
-  ]);
-
-  # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244
-  patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ];
-
-  postPatch = lib.optionalString stdenv.isDarwin ''
-    substituteInPlace libusal/scsi-mac-iokit.c \
-      --replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
-    substituteInPlace genisoimage/sha256.c \
-      --replace "<endian.h>" "<machine/endian.h>"
-    substituteInPlace genisoimage/sha512.c \
-      --replace "<endian.h>" "<machine/endian.h>"
-    substituteInPlace genisoimage/sha256.h \
-      --replace "__THROW" ""
-    substituteInPlace genisoimage/sha512.h \
-      --replace "__THROW" ""
-  '';
-
-  preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
-    substituteInPlace include/xconfig.h.in \
-        --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD"
-  '';
-
-  postConfigure = lib.optionalString stdenv.isDarwin ''
-    for f in */CMakeFiles/*.dir/link.txt ; do
-      substituteInPlace "$f" \
-        --replace "-lrt" "-framework IOKit"
-    done
-  '';
-
-  postInstall = ''
-    # file name compatibility with the old cdrecord (growisofs wants this name)
-    ln -s $out/bin/genisoimage $out/bin/mkisofs
-    ln -s $out/bin/wodim $out/bin/cdrecord
-  '';
-
-  cmakeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DBITFIELDS_HTOL=0" ];
-
-  makeFlags = [ "PREFIX=\$(out)" ];
-
-  meta = {
-    description = "Portable command-line CD/DVD recorder software, mostly compatible with cdrtools";
-
-    longDescription = ''
-      Cdrkit is a suite of programs for recording CDs and DVDs,
-      blanking CD-RW media, creating ISO-9660 filesystem images,
-      extracting audio CD data, and more.  The programs included in
-      the cdrkit package were originally derived from several sources,
-      most notably mkisofs by Eric Youngdale and others, cdda2wav by
-      Heiko Eissfeldt, and cdrecord by Jörg Schilling.  However,
-      cdrkit is not affiliated with any of these authors; it is now an
-      independent project.
-    '';
-
-    homepage = "http://cdrkit.org/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/tools/cd-dvd/cdrkit/include-path.patch b/pkgs/tools/cd-dvd/cdrkit/include-path.patch
deleted file mode 100644
index c071e182d7f5..000000000000
--- a/pkgs/tools/cd-dvd/cdrkit/include-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57edba6..d06b6d9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,4 @@
- PROJECT (cdrkit C)
-+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
- SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
- 
diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix
index 053aebecaf41..d264a0f8bdb3 100644
--- a/pkgs/tools/cd-dvd/cdrtools/default.nix
+++ b/pkgs/tools/cd-dvd/cdrtools/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ m4 ];
-  buildInputs = if stdenv.isDarwin then [ Carbon IOKit ] else [ acl libcap ];
+  buildInputs = if stdenv.hostPlatform.isDarwin then [ Carbon IOKit ] else [ acl libcap ];
 
   postPatch = ''
     sed "/\.mk3/d" -i libschily/Targets.man
diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix
deleted file mode 100644
index 8b2cd28e4a02..000000000000
--- a/pkgs/tools/cd-dvd/cuetools/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook
-, bison, flac, flex, id3v2, vorbis-tools
-}:
-
-stdenv.mkDerivation rec {
-  pname = "cuetools";
-  version = "1.4.1";
-
-  src = fetchFromGitHub {
-    owner = "svend";
-    repo = pname;
-    rev = version;
-    sha256 = "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  buildInputs = [ bison flac flex id3v2 vorbis-tools ];
-
-  postInstall = ''
-    # add link for compatibility with Debian-based distros, which package `cuetag.sh` as `cuetag`
-    ln -s $out/bin/cuetag.sh $out/bin/cuetag
-  '';
-
-  meta = with lib; {
-    description = "Set of utilities for working with cue files and toc files";
-    homepage = "https://github.com/svend/cuetools";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ codyopel jcumming ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch
deleted file mode 100644
index 7a7490c52673..000000000000
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.m4 b/Makefile.m4
-index a6a100b..bf7c041 100644
---- a/Makefile.m4
-+++ b/Makefile.m4
-@@ -30,8 +32,10 @@ LINK.o	=$(LINK.cc)
- # to install set-root-uid, `make BIN_MODE=04755 install'...
- BIN_MODE?=0755
- install:	dvd+rw-tools
--	install -o root -m $(BIN_MODE) $(CHAIN) /usr/bin
--	install -o root -m 0644 growisofs.1 /usr/share/man/man1
-+	install -d $(prefix)/bin
-+	install -d $(prefix)/share/man/man1
-+	install -m $(BIN_MODE) $(CHAIN) $(prefix)/bin
-+	install -m 0644 growisofs.1 $(prefix)/share/man/man1
- ])
- 
- ifelse(OS,MINGW32,[
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
deleted file mode 100644
index a6b75e14bef7..000000000000
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, cdrtools, m4, darwin }:
-
-let
-  inherit (darwin.apple_sdk.frameworks) IOKit;
-in
-stdenv.mkDerivation rec {
-  pname = "dvd+rw-tools";
-  version = "7.1";
-
-  src = fetchurl {
-    url = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pname}-${version}.tar.gz";
-    sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq";
-  };
-
-  patches = [ ./darwin.patch ]
-  # Patches from Gentoo
-  ++ builtins.map ({pfile, sha256}: fetchpatch {
-       url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-cdr/dvd+rw-tools/files/${pfile}?id=b510df361241e8f16314b1f14642305f0111dac6";
-       inherit sha256;
-     })
-     [{ pfile = "dvd+rw-tools-7.0-dvddl-r1.patch"; sha256 = "12l33jq6405shfwdycrj52qmd07h5bsp1vjaddknfri456azjny5"; }
-      { pfile = "dvd+rw-tools-7.0-glibc2.6.90.patch"; sha256 = "1fb3gap2in782pa4164h1w0ha8ggsq3inissa1k0zn2p2r3rb5ln"; }
-      { pfile = "dvd+rw-tools-7.0-reload.patch"; sha256 = "12v2y2y6ci5hh6lbmsk97dzgznrm4bxwhc81mq684ix0qspb9mq4"; }
-      { pfile = "dvd+rw-tools-7.0-sysmacros.patch"; sha256 = "1rkb26cyhfxklkmna3l9b4797f6gzlxyqqin44jwnq3jmwfrs6v0"; }
-      { pfile = "dvd+rw-tools-7.0-wctomb-r1.patch"; sha256 = "1xg770l0b4bjn30y7nqg619v4m5ickcn2n8hv9k2an6r191daq58"; }
-      { pfile = "dvd+rw-tools-7.0-wexit.patch"; sha256 = "0sqzlkm19fmjx4lzxkxwn2ymrj9fq0zk0jkys3xm6xvd2ibb6kxl"; }
-      { pfile = "dvd+rw-tools-7.1-bluray_pow_freespace.patch"; sha256 = "0iscz8fs5002ymk6wl2fz4x06b7bdnc57rfz8kbv3216acqi5rv3"; }
-      { pfile = "dvd+rw-tools-7.1-bluray_srm+pow.patch"; sha256 = "0sy40m12w987i6g0cyxv8cfmab4vp7cd222lv05apknfi2y7smmw"; }
-      { pfile = "dvd+rw-tools-7.1-lastshort.patch"; sha256 = "01wspv70sil20khkg5kj086b1x8rrig4yhcq9s88bdjd42nv0vpx"; }
-      { pfile = "dvd+rw-tools-7.1-noevent.patch"; sha256 = "1kbmxpg15wci33f2h6pxxvf3qm0kpyzx9wj5a3l67sk34hvza3z6"; }
-     ];
-
-  nativeBuildInputs = [ m4 ];
-  buildInputs = [ cdrtools ]
-    ++ lib.optionals stdenv.isDarwin [ IOKit ];
-
-  makeFlags = [
-    "prefix=${placeholder "out"}"
-    "CC=${stdenv.cc.targetPrefix}cc"
-    "CXX=${stdenv.cc.targetPrefix}c++"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
-    # error: invalid suffix on literal; C++11 requires a space between literal and identifier
-    "-Wno-reserved-user-defined-literal"
-    # error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'IOByteCount' (aka 'unsigned int') in initializer list
-    "-Wno-c++11-narrowing"
-  ]);
-
-  meta = with lib; {
-    homepage = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools";
-    description = "Tools for mastering Blu-ray and DVD+-RW/+-R media";
-    platforms = platforms.unix;
-    license = with licenses; [ gpl2Only publicDomain ];
-  };
-}
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix
deleted file mode 100644
index cd207ec6ec6e..000000000000
--- a/pkgs/tools/cd-dvd/dvd-vr/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dvd-vr";
-  version = "0.9.7";
-  src = fetchurl {
-    url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${finalAttrs.version}.tar.gz";
-    sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r";
-  };
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = with lib; {
-    homepage = "https://www.pixelbeat.org/programs/dvd-vr/";
-    downloadPage = "https://www.pixelbeat.org/programs/dvd-vr/";
-    description = "Utility to identify and optionally copy recordings from a DVD-VR format disc";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ fgaz ];
-    mainProgram = "dvd-vr";
-  };
-}
-)
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
deleted file mode 100644
index cb448ef157e1..000000000000
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, gettext
-, pkg-config
-, which
-, glib
-, gtk2
-, enableSoftening ? true
-}:
-
-stdenv.mkDerivation rec {
-  pname = "dvdisaster";
-  version = "0.79.10";
-
-  src = fetchurl {
-    url = "https://dvdisaster.jcea.es/downloads/${pname}-${version}.tar.bz2";
-    hash = "sha256-3Qqf9i8aSL9z2uJvm8P/QOPp83nODC3fyLL1iBIgf+g=";
-  };
-
-  nativeBuildInputs = [ gettext pkg-config which ];
-  buildInputs = [ glib gtk2 ];
-
-  patches = lib.optionals enableSoftening [
-    ./encryption.patch
-    ./dvdrom.patch
-  ];
-
-  postPatch = ''
-    patchShebangs ./
-    sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop
-    substituteInPlace scripts/bash-based-configure \
-      --replace 'if (make -v | grep "GNU Make") > /dev/null 2>&1 ;' \
-                'if make -v | grep "GNU Make" > /dev/null 2>&1 ;'
-  '';
-
-  configureFlags = [
-    # Explicit --docdir= is required for on-line help to work:
-    "--docdir=share/doc"
-    "--with-nls=yes"
-    "--with-embedded-src-path=no"
-  ] ++ lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes";
-
-  # fatal error: inlined-icons.h: No such file or directory
-  enableParallelBuilding = false;
-
-  doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-    pushd regtest
-
-    mkdir -p "$TMP"/{log,regtest}
-    substituteInPlace common.bash \
-      --replace /dev/shm "$TMP/log" \
-      --replace /var/tmp "$TMP"
-
-    for test in *.bash; do
-      case "$test" in
-      common.bash)
-        echo "Skipping $test"
-        continue ;;
-      *)
-        echo "Running $test"
-        ./"$test"
-      esac
-    done
-
-    popd
-    runHook postCheck
-  '';
-
-  postInstall = ''
-    rm -f $out/bin/dvdisaster-uninstall.sh
-    mkdir -pv $out/share/applications
-    cp contrib/dvdisaster.desktop $out/share/applications/
-
-    for size in 16 24 32 48 64; do
-      mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps/
-      cp contrib/dvdisaster"$size".png \
-        $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "https://dvdisaster.jcea.es/";
-    description = "Data loss/scratch/aging protection for CD/DVD media";
-    longDescription = ''
-      Dvdisaster provides a margin of safety against data loss on CD and
-      DVD media caused by scratches or aging media. It creates error correction
-      data which is used to recover unreadable sectors if the disc becomes
-      damaged at a later time.
-    '';
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ ];
-    mainProgram = "dvdisaster";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
deleted file mode 100644
index ce3f3de2bc03..000000000000
--- a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Corey Wright <undefined@pobox.com>
-Description: Adds support for DVD-ROM medium-type.
-
-Index: dvdisaster/scsi-layer.c
-===================================================================
---- dvdisaster.orig/scsi-layer.c	2012-03-06 11:10:17.147044691 +0900
-+++ dvdisaster/scsi-layer.c	2012-03-06 11:10:30.927044292 +0900
-@@ -913,6 +913,11 @@
- 	    break;
- 	 }
- 
-+	 if(layer_type & 0x01)
-+	 {  dh->typeDescr = g_strdup("DVD-ROM");
-+	    break;
-+	 }
-+
- 	 if(layer_type & 0x06) /* strange thing: (re-)writeable but neither plus nor dash */ 
- 	 {  dh->typeDescr = g_strdup("DVD-ROM (fake)");
- 	    dh->subType = DVD;
diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
deleted file mode 100644
index 21e35889382d..000000000000
--- a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: n/a
-Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
-
-diff -Naur dvdisaster-0.79.5.orig/scsi-layer.c dvdisaster-0.79.5/scsi-layer.c
---- dvdisaster-0.79.5.orig/scsi-layer.c	2015-10-28 21:56:57.000000000 +0100
-+++ dvdisaster-0.79.5/scsi-layer.c	2015-12-27 06:19:32.012253661 +0100
-@@ -2712,12 +2712,6 @@
-       }
-    }
- 
--   if(dh->mainType == DVD && query_copyright(dh))
--   {  CloseImage(image);
--      Stop(_("This software does not support encrypted media.\n"));
--      return NULL;
--   }
--
-    /* Create the bitmap of simulated defects */
- 
-    if(Closure->simulateDefects)
diff --git a/pkgs/tools/cd-dvd/iat/default.nix b/pkgs/tools/cd-dvd/iat/default.nix
deleted file mode 100644
index 67726ebf64e0..000000000000
--- a/pkgs/tools/cd-dvd/iat/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-}:
-
-stdenv.mkDerivation (finalAttr: {
-  pname = "iat";
-  version = "0.1.7";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/iat.berlios/iat-${finalAttr.version}.tar.gz";
-    hash = "sha256-sl1X/eKKArLYfNSf0UeLA5rb2DY1GHmmVP6hTCd2SyE=";
-  };
-
-  meta = with lib; {
-    description = "Tool for detecting the structure of many types of CD/DVD images";
-    homepage = "https://www.berlios.de/software/iso9660-analyzer-tool/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ hughobrien ];
-    platforms = platforms.linux;
-    mainProgram = "iat";
-  };
-})
diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/tools/cd-dvd/isolyzer/default.nix
deleted file mode 100644
index 6f231430fa86..000000000000
--- a/pkgs/tools/cd-dvd/isolyzer/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, python3
-, fetchFromGitHub
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "isolyzer";
-  version = "1.4.0";
-
-  src = fetchFromGitHub {
-    owner = "KBNLresearch";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-NqkjnEwpaoyguG5GLscKS9UQGtF9N4jUL5JhrMtKCFE=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [ setuptools six ];
-
-  meta = with lib; {
-    homepage = "https://github.com/KBNLresearch/isolyzer";
-    description = "Verify size of ISO 9660 image against Volume Descriptor fields";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mkg20001 ];
-    mainProgram = "isolyzer";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix
deleted file mode 100644
index 62022066a666..000000000000
--- a/pkgs/tools/cd-dvd/isomd5sum/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, python3
-, popt
-}:
-
-stdenv.mkDerivation rec {
-  pname = "isomd5sum";
-  version = "1.2.5";
-
-  src = fetchFromGitHub {
-    owner = "rhinstaller";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-c/4CQtAzatfG1Z3SfyB2OZmfJRMnyrZZTqSApsK7R+Q=";
-  };
-
-  strictDeps = true;
-  nativeBuildInputs = [ python3 ];
-  buildInputs = [ popt ] ;
-
-  postPatch = ''
-    substituteInPlace Makefile --replace "#/usr/" "#"
-    substituteInPlace Makefile --replace "/usr/" "/"
-  '';
-
-  dontConfigure = true;
-
-  makeFlags = [ "DESTDIR=${placeholder "out"}" ];
-
-  # we don't install python stuff as it borks up directories
-  installTargets = [ "install-bin" "install-devel" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/rhinstaller/isomd5sum";
-    description = "Utilities for working with md5sum implanted in ISO images";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ knl ];
-  };
-}
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
deleted file mode 100644
index c78ed61f4d24..000000000000
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, libdvdread, pkg-config }:
-
-stdenv.mkDerivation rec {
-  pname = "lsdvd";
-  version = "0.17";
-  src = fetchurl {
-    url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz";
-    sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x";
-  };
-
-  buildInputs = [ libdvdread ];
-  nativeBuildInputs = [ pkg-config ];
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/projects/lsdvd/";
-    description = "Display information about audio, video, and subtitle tracks on a DVD";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    mainProgram = "lsdvd";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/tools/cd-dvd/mdf2iso/default.nix
deleted file mode 100644
index c2057b758707..000000000000
--- a/pkgs/tools/cd-dvd/mdf2iso/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{lib, stdenv, fetchgit}:
-
-stdenv.mkDerivation rec {
-  pname = "mdf2iso";
-  version = "0.3.1";
-
-  src = fetchgit {
-    url    = "https://salsa.debian.org/debian/mdf2iso";
-    rev    = "c6a5b588318d43bc8af986bbe48d0a06e92f4280";
-    sha256 = "0xg43jlvrk8adfjgbjir15nxwcj0nhz4gxpqx7jdfvhg0kwliq0n";
-  };
-
-  meta = with lib; {
-    description = "Small utility that converts MDF images to ISO format";
-    homepage = src.url;
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.oxij ];
-    mainProgram = "mdf2iso";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix
deleted file mode 100644
index 34893b9f68a5..000000000000
--- a/pkgs/tools/cd-dvd/mkcue/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "mkcue";
-  version = "1";
-
-  src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/m/mkcue/mkcue_${version}.orig.tar.gz";
-    sha256 = "0rs897wp08z4hd904bjb5sl4lb8qxj82x5ayklr28bhg9pd5gbra";
-  };
-
-  env.CXXFLAGS = "-std=c++98";
-
-  preInstall = "mkdir -pv $out/bin";
-  postInstall = "chmod -v +w $out/bin/mkcue";
-
-  meta = with lib; {
-    description = "Generates CUE sheets from a CD TOC";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ];
-    mainProgram = "mkcue";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch b/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch
deleted file mode 100644
index 72752723470c..000000000000
--- a/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Support building with compilers such as Clang.
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
- all: nrg2iso.c
--	gcc nrg2iso.c -o nrg2iso
-+	cc nrg2iso.c -o nrg2iso
-
- clean:
- 	rm -f nrg2iso
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix
deleted file mode 100644
index a196f23544bb..000000000000
--- a/pkgs/tools/cd-dvd/nrg2iso/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{lib, stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  pname = "nrg2iso";
-  version = "0.4.1";
-
-  src = fetchurl {
-    url = "http://gregory.kokanosky.free.fr/v4/linux/${pname}-${version}.tar.gz";
-    sha256 = "sha256-O+NqQWdY/BkQRztJqNrfKiqj1R8ZdhlzNrwXS8HjBuU=";
-  };
-
-  patches = [ ./c-compiler.patch ];
-
-  installPhase = ''
-    mkdir -pv $out/bin/
-    cp -v nrg2iso $out/bin/nrg2iso
-  '';
-
-  meta = with lib; {
-    description = "Linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format";
-    homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html";
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
-    mainProgram = "nrg2iso";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix
deleted file mode 100644
index ddd2c2dcd8c8..000000000000
--- a/pkgs/tools/cd-dvd/sacd/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "sacd";
-  version = "19.7.16.37";
-
-  src = fetchFromGitHub {
-    owner = "Sound-Linux-More";
-    repo = "sacd";
-    rev = finalAttrs.version;
-    sha256 = "03s7jr75pzqj1xd41rkgbszlgf9zx6vzhd0nizc05wyf0fxq5xif";
-  };
-
-  patches = [
-    # Makefile prefix, otherwise `/usr` prefix is enforced
-    # https://github.com/Sound-Linux-More/sacd/pull/1
-    (fetchpatch {
-      url = "https://github.com/Sound-Linux-More/sacd/commit/a72def4fab234bcd68b444cf7447a8876b4e2ce8.patch";
-      name = "makefile-prefix.patch";
-      sha256 = "0a7r4x0yqpg6l4vr84dq4wbrypabqm4vvcjv91am068gqjiw6w64";
-    })
-  ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
-
-  meta = with lib; {
-    description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams.";
-    longDescription = ''
-      Super Audio CD decoder. Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files.
-      Handles both DST and DSD streams.
-    '';
-    homepage = "https://github.com/Sound-Linux-More/sacd";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.doronbehar ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "sacd";
-  };
-})
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
deleted file mode 100644
index b0868c885edd..000000000000
--- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "srt-to-vtt-cl";
-  version = "unstable-2019-01-03";
-
-  src = fetchFromGitHub {
-    owner = "nwoltman";
-    repo = pname;
-    rev = "ce3d0776906eb847c129d99a85077b5082f74724";
-    sha256 = "0qxysj08gjr6npyvg148llmwmjl2n9cyqjllfnf3gxb841dy370n";
-  };
-
-  patches = [
-    ./fix-validation.patch
-    ./simplify-macOS-builds.patch
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/srt-vtt $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Convert SRT files to VTT";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ericdallo ];
-    homepage = "https://github.com/nwoltman/srt-to-vtt-cl";
-    platforms = platforms.unix;
-    mainProgram = "srt-vtt";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch b/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
deleted file mode 100644
index abddae6d0719..000000000000
--- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,4 @@
--ERR = $(shell which clang++ >/dev/null; echo $$?)
--ifeq "$(ERR)" "0"
--	CXX ?= clang++
--else
--	CXX ?= g++
--endif
-+CXX ?= g++
- CXXFLAGS = -std=c++11 -O2 -MMD -I ./deps
- OBJECTS := src/text_encoding_detect.o src/Utils.o src/Converter.o src/main.o
- DEPENDS := $(OBJECTS:.o=.d)
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch b/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch
deleted file mode 100644
index 71497f23beef..000000000000
--- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From be08356f421825d3d2dd7ab687f86d9981a31f9a Mon Sep 17 00:00:00 2001
-From: "Travis A. Everett" <travis.a.everett@gmail.com>
-Date: Thu, 3 Aug 2023 20:15:40 -0500
-Subject: [PATCH] simplify macOS builds
-
----
- Makefile | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 6dfd829..19c3ae3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,13 +8,7 @@ CXXFLAGS = -std=c++11 -O2 -MMD -I ./deps
- OBJECTS := src/text_encoding_detect.o src/Utils.o src/Converter.o src/main.o
- DEPENDS := $(OBJECTS:.o=.d)
- EXEC = srt-vtt
--UNAME_S := $(shell uname -s)
--ifeq ($(UNAME_S), Darwin)
--	BIN_DIR = bin/Mac-OSX
--else
--	UNAME_M := $(shell uname -m)
--	BIN_DIR = bin/$(UNAME_S)/$(UNAME_M)
--endif
-+BIN_DIR = bin
- EXEC_PATH = $(BIN_DIR)/$(EXEC)
- 
- .PHONY: test
--- 
-2.39.0
-
diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix
deleted file mode 100644
index ae1eff26568f..000000000000
--- a/pkgs/tools/cd-dvd/uif2iso/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl, unzip, zlib }:
-
-stdenv.mkDerivation rec {
-  pname = "uif2iso";
-  version = "0.1.7";
-
-  src = fetchurl {
-    url = "http://aluigi.altervista.org/mytoolz/uif2iso.zip";
-    sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [zlib];
-
-  installPhase = ''
-    make -C . prefix="$out" install;
-  '';
-
-  meta = {
-    description = "Tool for converting single/multi part UIF image files to ISO";
-    homepage = "http://aluigi.org/mytoolz.htm#uif2iso";
-    license = lib.licenses.gpl1Plus;
-    platforms = lib.platforms.linux;
-    mainProgram = "uif2iso";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix
deleted file mode 100644
index 4b74ffbc8ad2..000000000000
--- a/pkgs/tools/cd-dvd/vobcopy/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, libdvdread, libdvdcss }:
-
-stdenv.mkDerivation rec {
-  pname = "vobcopy";
-  version = "1.2.0";
-
-  src = fetchurl {
-    url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2";
-    sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9";
-  };
-
-  buildInputs = [libdvdread libdvdcss];
-  makeFlags   = [ "DESTDIR=$(out)" "PREFIX=/" ];
-
-  meta = {
-    description = "Copies DVD .vob files to harddisk, decrypting them on the way";
-    homepage = "http://vobcopy.org/projects/c/c.shtml";
-    license = lib.licenses.gpl2Plus;
-
-    maintainers = [ lib.maintainers.bluescreen303 ];
-    platforms = lib.platforms.all;
-    mainProgram = "vobcopy";
-  };
-}
diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
deleted file mode 100644
index 2847c68899fe..000000000000
--- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libtiff, pkg-config, tesseract3 }:
-
-stdenv.mkDerivation rec {
-  pname = "vobsub2srt";
-  version = "unstable-2014-08-17";
-
-  src = fetchFromGitHub {
-    owner = "ruediger";
-    repo = "VobSub2SRT";
-    rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
-    sha256 = "sha256-i6V2Owb8GcTcWowgb/BmdupOSFsYiCF2SbC9hXa26uY=";
-  };
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-std=c++11" ]);
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ libtiff ];
-  propagatedBuildInputs = [ tesseract3 ];
-
-  meta = {
-    homepage = "https://github.com/ruediger/VobSub2SRT";
-    description = "Converts VobSub subtitles into SRT subtitles";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.ttuegel ];
-    mainProgram = "vobsub2srt";
-  };
-}