From 8a220dfe9c34d4c302aee97afc21b59dcc8fe728 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 3 Aug 2020 19:37:02 +0200
Subject: mamba: init at 1.1

---
 pkgs/applications/audio/mamba/default.nix | 45 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/audio/mamba/default.nix

diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix
new file mode 100644
index 000000000000..75f728f44cce
--- /dev/null
+++ b/pkgs/applications/audio/mamba/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, fetchFromGitHub
+, xorg
+, cairo
+, libjack2
+, pcre
+, libXdmcp
+, libsigcxx
+, liblo
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mamba";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "brummer10";
+    repo = "Mamba";
+    rev = "v${version}";
+    sha256 = "1rjy7l9sx8xvk64s29g0jrrirm5h2qg0pdvvz4i1kkbs7nasnjm5";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    xorg.libX11
+    xorg.libpthreadstubs
+    cairo
+    libjack2
+    pcre
+    libXdmcp
+    libsigcxx
+    liblo
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/brummer10/Mamba";
+    description = "Virtual MIDI keyboard for Jack Audio Connection Kit";
+    maintainers = [ maintainers.magnetophon ];
+    license = licenses.bsd0;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56342cad1210..c31b532fa20a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26373,6 +26373,8 @@ in
     icu = icu58;
   };
 
+  mamba = callPackage ../applications/audio/mamba{ };
+
   mame = libsForQt5.callPackage ../misc/emulators/mame {
     inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
   };
-- 
cgit v1.2.3


From ccd76df5b994714e16e49e54034d7500a3dd5de8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 16 Aug 2020 09:30:11 +0000
Subject: mamba: 1.1 -> 1.3

---
 pkgs/applications/audio/mamba/default.nix     | 31 +++++++++++----------------
 pkgs/applications/audio/mamba/fix-build.patch | 10 +++++++++
 2 files changed, 23 insertions(+), 18 deletions(-)
 create 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 75f728f44cce..a3e33471cee8 100644
--- a/pkgs/applications/audio/mamba/default.nix
+++ b/pkgs/applications/audio/mamba/default.nix
@@ -1,45 +1,40 @@
 { stdenv
 , fetchFromGitHub
-, xorg
+, pkgconfig
 , cairo
+, libX11
 , libjack2
-, pcre
-, libXdmcp
-, libsigcxx
 , liblo
-, pkgconfig
+, libsigcxx
+, libsmf
 }:
 
 stdenv.mkDerivation rec {
   pname = "mamba";
-  version = "1.1";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "Mamba";
     rev = "v${version}";
-    sha256 = "1rjy7l9sx8xvk64s29g0jrrirm5h2qg0pdvvz4i1kkbs7nasnjm5";
+    sha256 = "1wa3f9c4l239mpxa7nxx8hajy4icn40vpvaxq5l1qzskl74w072d";
     fetchSubmodules = true;
   };
 
+  patches = [ ./fix-build.patch ];
+
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    xorg.libX11
-    xorg.libpthreadstubs
-    cairo
-    libjack2
-    pcre
-    libXdmcp
-    libsigcxx
-    liblo
-  ];
+  buildInputs = [ cairo libX11 libjack2 liblo libsigcxx libsmf ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/brummer10/Mamba";
     description = "Virtual MIDI keyboard for Jack Audio Connection Kit";
-    maintainers = [ maintainers.magnetophon ];
     license = licenses.bsd0;
+    maintainers = with maintainers; [ magnetophon orivej ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/mamba/fix-build.patch b/pkgs/applications/audio/mamba/fix-build.patch
new file mode 100644
index 000000000000..ed366963676c
--- /dev/null
+++ b/pkgs/applications/audio/mamba/fix-build.patch
@@ -0,0 +1,10 @@
+--- 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
-- 
cgit v1.2.3