From 99d338b130dac78984b9bf2061f6ad346cf9b44e Mon Sep 17 00:00:00 2001
From: hhm <heehooman+vcs-ci@gmail.com>
Date: Tue, 26 Feb 2019 00:02:59 -0500
Subject: [PATCH 1/2] cuetools: symlink cuetag to cuetag.sh

Debian-based distros call cuetag.sh "cuetag" (see https://packages.debian.org/buster/amd64/cuetools/filelist).
This adds a symlink for compatibility with those distros.
---
 pkgs/tools/cd-dvd/cuetools/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix
index d600f280400..2911f61e249 100644
--- a/pkgs/tools/cd-dvd/cuetools/default.nix
+++ b/pkgs/tools/cd-dvd/cuetools/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
 
   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 stdenv.lib; {
     description = "A set of utilities for working with cue files and toc files";
     homepage = https://github.com/svend/cuetools;

From 3fb66709ff870986bf64ed7b643c7c9f1bc012e1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 26 Feb 2019 20:25:50 -0500
Subject: [PATCH 2/2] cuetools: use fetchFromGitHub

---
 pkgs/tools/cd-dvd/cuetools/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix
index 2911f61e249..e4e34aa919b 100644
--- a/pkgs/tools/cd-dvd/cuetools/default.nix
+++ b/pkgs/tools/cd-dvd/cuetools/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, autoreconfHook
+{ stdenv, fetchFromGitHub, autoreconfHook
 , bison, flac, flex, id3v2, vorbis-tools
 }:
 
 stdenv.mkDerivation rec {
-  name = "cuetools-${version}";
+  pname = "cuetools";
   version = "1.4.1";
 
-  src = fetchurl {
-    url = "https://github.com/svend/cuetools/archive/${version}.tar.gz";
-    sha256 = "01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4";
+  src = fetchFromGitHub {
+    owner = "svend";
+    repo = pname;
+    rev = version;
+    sha256 = "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3";
   };
 
   nativeBuildInputs = [ autoreconfHook ];