mamba: 1.3 -> 1.4

This commit is contained in:
Orivej Desh 2020-09-06 03:25:28 +00:00
parent 619061532a
commit 4c9b89a764
3 changed files with 7 additions and 18 deletions

View File

@ -1,7 +1,8 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, pkgconfig , pkg-config
, cairo , cairo
, fluidsynth
, libX11 , libX11
, libjack2 , libjack2
, liblo , liblo
@ -11,20 +12,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mamba"; pname = "mamba";
version = "1.3"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brummer10"; owner = "brummer10";
repo = "Mamba"; repo = "Mamba";
rev = "v${version}"; rev = "v${version}";
sha256 = "1wa3f9c4l239mpxa7nxx8hajy4icn40vpvaxq5l1qzskl74w072d"; sha256 = "08dcm0mmka1lbssrgck66v9l2rk3r4y63ij06aw2f9la8a84y20j";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ ./fix-build.patch ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ cairo fluidsynth libX11 libjack2 liblo libsigcxx libsmf ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo libX11 libjack2 liblo libsigcxx libsmf ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

View File

@ -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

View File

@ -26824,7 +26824,7 @@ in
icu = icu58; icu = icu58;
}; };
mamba = callPackage ../applications/audio/mamba{ }; mamba = callPackage ../applications/audio/mamba { };
mame = libsForQt514.callPackage ../misc/emulators/mame { mame = libsForQt514.callPackage ../misc/emulators/mame {
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;