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 -, cairo -, libjack2 -, pcre -, libXdmcp -, libsigcxx -, liblo , pkgconfig +, cairo +, libX11 +, libjack2 +, liblo +, 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