giada: 0.16.1 -> 0.16.2.2

+ use system catch and nlohmann_json
This commit is contained in:
Pavol Rusnak 2020-05-09 13:23:59 +02:00 committed by Milan
parent a84f932e31
commit cfe68f2b68
1 changed files with 33 additions and 8 deletions

View File

@ -1,23 +1,41 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, { stdenv
fltk, jansson, rtmidi, libsamplerate, libsndfile, , fetchFromGitHub
jack2, alsaLib, libpulseaudio, , autoreconfHook
libXpm, libXinerama, libXcursor }: , fltk
, jansson
, rtmidi
, libsamplerate
, libsndfile
, jack2
, alsaLib
, libpulseaudio
, libXpm
, libXinerama
, libXcursor
, catch2
, nlohmann_json
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "giada"; pname = "giada";
version = "0.16.1"; version = "0.16.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monocasual"; owner = "monocasual";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0b3lhjs6myml5r5saky15523sbc3qr43r9rh047vhsiafmqdvfq1"; sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p";
}; };
configureFlags = [ "--target=linux" ]; configureFlags = [
"--target=linux"
"--enable-system-catch"
];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
]; ];
buildInputs = [ buildInputs = [
fltk fltk
libsndfile libsndfile
@ -30,9 +48,16 @@ stdenv.mkDerivation rec {
libpulseaudio libpulseaudio
libXinerama libXinerama
libXcursor libXcursor
catch2
nlohmann_json
]; ];
meta = with lib; { postPatch = ''
sed -i 's:"deps/json/single_include/nlohmann/json\.hpp":<nlohmann/json.hpp>:' \
src/core/{conf,init,midiMapConf,patch}.cpp
'';
meta = with stdenv.lib; {
description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians";
homepage = "https://giadamusic.com/"; homepage = "https://giadamusic.com/";
license = licenses.gpl3; license = licenses.gpl3;