From cfe68f2b68b7a7c2e5347c496b6963af30d18d3f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 9 May 2020 13:23:59 +0200
Subject: giada: 0.16.1 -> 0.16.2.2

+ use system catch and nlohmann_json
---
 pkgs/applications/audio/giada/default.nix | 41 +++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix
index eff1d6411a15b..fcf4d0b86520f 100644
--- a/pkgs/applications/audio/giada/default.nix
+++ b/pkgs/applications/audio/giada/default.nix
@@ -1,23 +1,41 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook,
-  fltk, jansson, rtmidi, libsamplerate, libsndfile,
-  jack2, alsaLib, libpulseaudio,
-  libXpm, libXinerama, libXcursor }:
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, fltk
+, jansson
+, rtmidi
+, libsamplerate
+, libsndfile
+, jack2
+, alsaLib
+, libpulseaudio
+, libXpm
+, libXinerama
+, libXcursor
+, catch2
+, nlohmann_json
+}:
 
 stdenv.mkDerivation rec {
   pname = "giada";
-  version = "0.16.1";
+  version = "0.16.2.2";
 
   src = fetchFromGitHub {
     owner = "monocasual";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0b3lhjs6myml5r5saky15523sbc3qr43r9rh047vhsiafmqdvfq1";
+    sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p";
   };
 
-  configureFlags = [ "--target=linux" ];
+  configureFlags = [
+    "--target=linux"
+    "--enable-system-catch"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
   ];
+
   buildInputs = [
     fltk
     libsndfile
@@ -30,9 +48,16 @@ stdenv.mkDerivation rec {
     libpulseaudio
     libXinerama
     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";
     homepage = "https://giadamusic.com/";
     license = licenses.gpl3;
-- 
cgit 1.4.1