From 479867700baa7ced259c979a0f724915c4d46d12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 7 Jan 2021 09:13:02 +0100 Subject: [PATCH] ecasound: let it use more dependencies Patch partially contributed by Kai Ruemmler. --- pkgs/applications/audio/ecasound/default.nix | 37 ++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index adb6f6b7427..505e5a604ca 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, pkg-config , alsaLib , audiofile , libjack2 @@ -9,9 +10,14 @@ , libsndfile , lilv , lv2 +, ncurses +, readline }: -# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. +# TODO: fix python. See configure log. +# fix -Dnullptr=0 cludge below. +# The error is +# /nix/store/*-lilv-0.24.10/include/lilv-0/lilv/lilvmm.hpp:272:53: error: 'nullptr' was not declared in this scope stdenv.mkDerivation rec { pname = "ecasound"; @@ -22,7 +28,34 @@ stdenv.mkDerivation rec { sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6"; }; - buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsaLib + audiofile + libjack2 + liblo + liboil + libsamplerate + libsndfile + lilv + lv2 + ncurses + readline + ]; + + strictDeps = true; + + configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0"; + + postPatch = '' + sed -i -e ' + s@^#include @#include @ + s@^#include @#include @ + ' ecasound/eca-curses.cpp + ''; meta = { description = "Software package designed for multitrack audio processing";