diff options
author | Orivej Desh <orivej@gmx.fr> | 2020-09-06 03:25:28 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2020-09-11 02:10:54 +0000 |
commit | 4c9b89a764a80d9f280a9197a40454f54d3728a3 (patch) | |
tree | a0438be7a7e44fe1ef74c12c44036a726dc0f7a4 /pkgs/applications/audio | |
parent | 619061532aabb4a7c6341b0674b9d9dd4faef1bd (diff) |
mamba: 1.3 -> 1.4
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/mamba/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/audio/mamba/fix-build.patch | 10 |
2 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index a3e33471cee85..ad0a41bc0059e 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 ed366963676c3..0000000000000 --- 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 |