diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8631c4ba83c..d02e2cec53d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -98,6 +98,7 @@ lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; madjar = "Georges Dubus "; + magnetophon = "Bart Brouns "; manveru = "Michael Fellinger "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/default.nix index e9f47088f52..bcfd6020a4f 100644 --- a/pkgs/applications/audio/faust/default.nix +++ b/pkgs/applications/audio/faust/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip, pkgconfig, gcc }: +{ fetchurl, stdenv, unzip }: stdenv.mkDerivation rec { @@ -9,13 +9,17 @@ stdenv.mkDerivation rec { sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; }; - buildInputs = [ unzip pkgconfig gcc ]; + buildInputs = [ unzip ]; patchPhase='' + sed -i '77,101d' Makefile sed -i 's#?= $(shell uname -s)#:= Linux#g' architecture/osclib/oscpack/Makefile sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@$out@g" -i tools/faust2appls/faustpath ''; + postInstallPhase='' + rm -rf $out/include/ + ''; makeFlags="PREFIX=$(out)";