Merge pull request #231389 from wkral/giada-build-fix

giada: unstable-2021-09-24 -> 0.24.0

authored by

Robert Scott and committed by
GitHub
5cc42320 2f018f0a

+22 -16
+22 -16
pkgs/applications/audio/giada/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , pkg-config 6 7 , fltk 8 + , fmt 7 9 , rtmidi 8 10 , libsamplerate 11 + , libmpg123 9 12 , libsndfile 10 13 , jack2 11 14 , alsa-lib 12 15 , libpulseaudio 13 16 , libXpm 17 + , libXrandr 14 18 , flac 15 19 , libogg 16 20 , libvorbis 17 21 , libopus 22 + , nlohmann_json 18 23 }: 19 24 20 25 stdenv.mkDerivation rec { 21 26 pname = "giada"; 22 - version = "unstable-2021-09-24"; 27 + version = "0.24.0"; 23 28 24 29 src = fetchFromGitHub { 25 30 owner = "monocasual"; 26 31 repo = pname; 27 - # Using master with https://github.com/monocasual/giada/pull/509 till a new release is done. 28 - rev = "f117a8b8eef08d904ef1ab22c45f0e1fad6b8a56"; 29 - sha256 = "01hb981lrsyk870zs8xph5fm0z7bbffpkxgw04hq487r804mkx9j"; 32 + rev = "v${version}"; 33 + sha256 = "sha256-pKzc+RRW3o5vYaiGqW9/VjYZZJvr6cg1kdjP9qRkHwM="; 30 34 fetchSubmodules = true; 31 35 }; 32 36 37 + patches = [ 38 + # Remove when updating to the next release, this PR is already merged 39 + # Fix fmt type error: https://github.com/monocasual/giada/pull/635 40 + (fetchpatch { 41 + name = "fix-fmt-type-error.patch"; 42 + url = "https://github.com/monocasual/giada/commit/032af4334f6d2bb7e77a49e7aef5b4c4d696df9a.patch"; 43 + hash = "sha256-QuxETvBWzA1v2ifyNzlNMGfQ6XhYQF03sGZA9rBx1xU="; 44 + }) 45 + ]; 46 + 33 47 env.NIX_CFLAGS_COMPILE = toString [ 34 48 "-w" 35 49 "-Wno-error" ··· 48 62 buildInputs = [ 49 63 rtmidi 50 64 fltk 65 + fmt 66 + libmpg123 51 67 libsndfile 52 68 libsamplerate 69 + nlohmann_json 53 70 alsa-lib 54 71 libXpm 55 72 libpulseaudio ··· 58 75 libogg 59 76 libvorbis 60 77 libopus 78 + libXrandr 61 79 ]; 62 - 63 - postPatch = '' 64 - local fixup_list=( 65 - src/core/kernelMidi.cpp 66 - src/gui/elems/config/tabMidi.cpp 67 - src/utils/ver.cpp 68 - ) 69 - for f in "''${fixup_list[@]}"; do 70 - substituteInPlace "$f" \ 71 - --replace "<RtMidi.h>" "<${rtmidi.src}/RtMidi.h>" 72 - done 73 - ''; 74 80 75 81 meta = with lib; { 76 82 description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians";