From 71ec67dcc77b98402868cd5142a5c38bbde64893 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 30 Nov 2024 01:13:44 +0100
Subject: [PATCH] mac: drop same package as monkeysAudio

---
 .../audio/soundkonverter/default.nix          |  4 +--
 pkgs/by-name/ma/mac/package.nix               | 36 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/ma/mac/package.nix

diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix
index 0aebd46210da..87c063ce009f 100644
--- a/pkgs/applications/audio/soundkonverter/default.nix
+++ b/pkgs/applications/audio/soundkonverter/default.nix
@@ -19,7 +19,7 @@
   withSox ? true, sox,
   withOpus ? true, opusTools,
   withTwolame ? false, twolame,
-  withApe ? false, mac,
+  withApe ? false, monkeysAudio,
   withWavpack ? false, wavpack
 }:
 
@@ -35,7 +35,7 @@ let runtimeDeps = []
     ++ lib.optional withSox sox
     ++ lib.optional withOpus opusTools
     ++ lib.optional withTwolame twolame
-    ++ lib.optional withApe mac
+    ++ lib.optional withApe monkeysAudio
     ++ lib.optional withWavpack wavpack
     ++ lib.optional withUnfreeAac faac
     ++ lib.optionals withMidi [ fluidsynth timidity ]
diff --git a/pkgs/by-name/ma/mac/package.nix b/pkgs/by-name/ma/mac/package.nix
deleted file mode 100644
index ca58c20eab9b..000000000000
--- a/pkgs/by-name/ma/mac/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, yasm }:
-
-stdenv.mkDerivation rec {
-  pname = "mac";
-  version = "4.11-u4-b5-s7";
-
-  src = fetchurl {
-    url = "https://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_${version}.orig.tar.gz";
-    sha256 = "16i96cw5r3xbsivjigqp15vv32wa38k86mxq11qx1pzmpryqpqkk";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "mac-4.11.4.5.7-gcc6.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4";
-      sha256 = "093b8m8p8s6dmc62fc8vb4hlmjc2ncb4rdgc82g0a8gg6w5kcj8x";
-    })
-    (fetchpatch {
-      name = "mac-4.11.4.5.7-output.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-output.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4";
-      sha256 = "0njmwj6d9jqi4pz4fax02w37gk22vda0grszrs2nn97zzmjl36zk";
-    })
-  ];
-
-  CXXFLAGS = "-DSHNTOOL";
-
-  nativeBuildInputs = [ yasm ];
-
-  meta = with lib; {
-    description = "APE codec and decompressor";
-    homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php";
-    license = licenses.unfreeRedistributable;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6fdda136f76d..3c07462edfa4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -772,6 +772,7 @@ mapAliases {
   ### M ###
 
   ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
+  mac = monkeysAudio; # Added 2024-11-30
   MACS2 = macs2; # Added 2023-06-12
   mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19
   mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21