3 files changed, 5 insertions, 87 deletions
diff --git a/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix b/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix
deleted file mode 100644
index 18ef6f02d80c..000000000000
--- a/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "ecm-tools";
-  version = "1.0.3";
-
-  src = fetchFromGitHub {
-    owner = "alucryd";
-    repo = "ecm-tools";
-    rev = "v${version}";
-    sha256 = "1rvyx5gcy8lfklgj80szlz3312x45wzx0d9jsgwyvy8f6m4nnb0c";
-  };
-
-  dontConfigure = true;
-
-  installPhase = ''
-    install --directory --mode=755 $out/bin
-    install --mode=755 bin2ecm $out/bin
-    (cd $out/bin; ln -s bin2ecm ecm2bin)
-  '';
-
-  meta = with lib; {
-    description = "A utility to uncompress ECM files to BIN CD format";
-    homepage = "https://github.com/alucryd/ecm-tools";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.all;
-  };
-}
diff --git a/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix b/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix
index 23bf808c50fe..963300c9ca11 100644
--- a/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix
+++ b/nixpkgs/pkgs/tools/cd-dvd/sacd/default.nix
@@ -1,16 +1,17 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sacd";
   version = "19.7.16.37";
 
   src = fetchFromGitHub {
     owner = "Sound-Linux-More";
     repo = "sacd";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "03s7jr75pzqj1xd41rkgbszlgf9zx6vzhd0nizc05wyf0fxq5xif";
   };
 
@@ -38,4 +39,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.doronbehar ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})
diff --git a/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix b/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix
deleted file mode 100644
index 1262ce367f24..000000000000
--- a/nixpkgs/pkgs/tools/cd-dvd/xorriso/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, acl
-, attr
-, bzip2
-, libcdio
-, libiconv
-, readline
-, zlib
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xorriso";
-  version = "1.5.6.pl02";
-
-  src = fetchurl {
-    url = "mirror://gnu/xorriso/xorriso-${finalAttrs.version}.tar.gz";
-    hash = "sha256-eG+fXfmGXMWwwf7O49LA9eBMq4yahZvRycfM1JZP2uE=";
-  };
-
-  doCheck = true;
-
-  buildInputs = [
-    bzip2
-    libcdio
-    libiconv
-    readline
-    zlib
-  ]
-  ++ lib.optionals stdenv.isLinux [
-    acl
-    attr
-  ];
-
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-include unistd.h";
-
-  meta = {
-    homepage = "https://www.gnu.org/software/xorriso/";
-    description = "ISO 9660 Rock Ridge file system manipulator";
-    longDescription = ''
-      GNU xorriso copies file objects from POSIX compliant filesystems into Rock
-      Ridge enhanced ISO 9660 filesystems and allows session-wise manipulation
-      of such filesystems. It can load the management information of existing
-      ISO images and it writes the session results to optical media or to
-      filesystem objects.
-      Vice versa xorriso is able to copy file objects out of ISO 9660
-      filesystems.
-    '';
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-})