From 4c9b89a764a80d9f280a9197a40454f54d3728a3 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 6 Sep 2020 03:25:28 +0000
Subject: [PATCH] mamba: 1.3 -> 1.4

---
 pkgs/applications/audio/mamba/default.nix     | 13 ++++++-------
 pkgs/applications/audio/mamba/fix-build.patch | 10 ----------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/audio/mamba/fix-build.patch

diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix
index a3e33471cee..ad0a41bc005 100644
--- a/pkgs/applications/audio/mamba/default.nix
+++ b/pkgs/applications/audio/mamba/default.nix
@@ -1,7 +1,8 @@
 { stdenv
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , cairo
+, fluidsynth
 , libX11
 , libjack2
 , liblo
@@ -11,20 +12,18 @@
 
 stdenv.mkDerivation rec {
   pname = "mamba";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "Mamba";
     rev = "v${version}";
-    sha256 = "1wa3f9c4l239mpxa7nxx8hajy4icn40vpvaxq5l1qzskl74w072d";
+    sha256 = "08dcm0mmka1lbssrgck66v9l2rk3r4y63ij06aw2f9la8a84y20j";
     fetchSubmodules = true;
   };
 
-  patches = [ ./fix-build.patch ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cairo libX11 libjack2 liblo libsigcxx libsmf ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ cairo fluidsynth libX11 libjack2 liblo libsigcxx libsmf ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/applications/audio/mamba/fix-build.patch b/pkgs/applications/audio/mamba/fix-build.patch
deleted file mode 100644
index ed366963676..00000000000
--- a/pkgs/applications/audio/mamba/fix-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libxputty/Build/Makefile
-+++ b/libxputty/Build/Makefile
-@@ -20,1 +20,1 @@
--	LDFLAGS += -fPIC `pkg-config --static --cflags --libs cairo x11` -lm
-+	LDFLAGS += -fPIC `pkg-config --cflags --libs cairo x11` -lm
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -84,1 +83,1 @@ ifneq ("$(wildcard ./$(BUILD_DIR))","")
--	update-desktop-database
-+	update-desktop-database || true
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c03b9d7a8ed..30889e14d57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26824,7 +26824,7 @@ in
     icu = icu58;
   };
 
-  mamba = callPackage ../applications/audio/mamba{ };
+  mamba = callPackage ../applications/audio/mamba { };
 
   mame = libsForQt514.callPackage ../misc/emulators/mame {
     inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;