about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorBart Brouns <bart@magnetophon.nl>2014-11-24 21:57:36 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-11-24 22:00:58 +0100
commit0168c1ba194e35f618a311b6d07cc86461c9b77f (patch)
tree94c69bfc07955a1f6746bbb0c162c4bc62fe3ad0 /pkgs
parentf83aa6c0ea72e5957dc5e5da08653ef91184c98e (diff)
downloadnixlib-0168c1ba194e35f618a311b6d07cc86461c9b77f.tar
nixlib-0168c1ba194e35f618a311b6d07cc86461c9b77f.tar.gz
nixlib-0168c1ba194e35f618a311b6d07cc86461c9b77f.tar.bz2
nixlib-0168c1ba194e35f618a311b6d07cc86461c9b77f.tar.lz
nixlib-0168c1ba194e35f618a311b6d07cc86461c9b77f.tar.xz
nixlib-0168c1ba194e35f618a311b6d07cc86461c9b77f.tar.zst
nixlib-0168c1ba194e35f618a311b6d07cc86461c9b77f.zip
faust: rename to faust-compiler (close #5113)
@vcunat adjusted coding style slightly.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/audio/faust-compiler/default.nix (renamed from pkgs/applications/audio/faust/default.nix)19
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust-compiler/default.nix
index bcfd6020a4fc..f924fe2953d7 100644
--- a/pkgs/applications/audio/faust/default.nix
+++ b/pkgs/applications/audio/faust-compiler/default.nix
@@ -3,25 +3,26 @@
 stdenv.mkDerivation rec {
 
   version = "0.9.67";
-  name = "faust-${version}";
+  name = "faust-compiler-${version}";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/faudiostream/${name}.zip";
+    url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip";
     sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1";
   };
 
   buildInputs = [ unzip ];
 
-  patchPhase=''
+  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=''
+  postInstallPhase = ''
     rm -rf $out/include/
-    '';
-  
-  makeFlags="PREFIX=$(out)";
+  '';
+
+  makeFlags = "PREFIX=$(out)";
+  FPATH = "$out"; # <- where to search
 
   meta = with stdenv.lib; {
     description = "A functional programming language for realtime audio signal processing";
@@ -37,6 +38,8 @@ stdenv.mkDerivation rec {
       audio platforms and plugin formats (jack, alsa, ladspa, maxmsp,
       puredata, csound, supercollider, pure, vst, coreaudio) without
       any change to the FAUST code.
+      This package has just the compiler. Install faust for the full
+      set of faust2somethingElse tools.
     '';
     homepage = http://faust.grame.fr/;
     downloadPage = http://sourceforge.net/projects/faudiostream/files/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21479eaabf78..29f1dea4a4a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12387,7 +12387,7 @@ let
 
   fakenes = callPackage ../misc/emulators/fakenes { };
 
-  faust = callPackage ../applications/audio/faust { };
+  faust-compiler = callPackage ../applications/audio/faust-compiler { };
 
   fceux = callPackage ../misc/emulators/fceux { };