summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-08-16 09:30:11 +0000
committerOrivej Desh <orivej@gmx.fr>2020-08-16 09:57:46 +0000
commitccd76df5b994714e16e49e54034d7500a3dd5de8 (patch)
tree005bfc1a96060f7216c4f3411c4f65b10a1d6c60
parent8a220dfe9c34d4c302aee97afc21b59dcc8fe728 (diff)
mamba: 1.1 -> 1.3
-rw-r--r--pkgs/applications/audio/mamba/default.nix31
-rw-r--r--pkgs/applications/audio/mamba/fix-build.patch10
2 files changed, 23 insertions, 18 deletions
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