snd shows it's help in firefox now

svn path=/nixpkgs/trunk/; revision=12651

1 files changed, 19 insertions, 6 deletions

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index e500ff736d4c..0a8bb95173f3 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -6,33 +6,46 @@ args : with args;
 		sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
 	};
 
-		buildInputs = [gtk glib pkgconfig libXpm gmp gettext libX11]
+		buildInputs = [gtk glib pkgconfig libXpm gmp gettext libX11 fftw]
 			++ (lib.optional (args ? ruby) args.ruby)
 			++ (lib.optional (args ? mesa) args.mesa)
 			++ (lib.optional (args ? guile) args.guile)
 			++ (lib.optional (args ? libtool) args.libtool)
 			++ (lib.optional (args ? sndlib) args.sndlib)
+			++ (lib.optional (args ? alsaLib) args.alsaLib)
+			++ (lib.optional (args ? jackaudio) args.jackaudio)
 			;
 		configureFlags = ["--with-gtk" "--with-xpm"]
 			++ (lib.optional (args ? ruby)   "--with-ruby" )
 			++ (lib.optional (args ? mesa)   "--with-gl"   )
 			++ (lib.optional (args ? guile)  "--with-guile")
 			++ (lib.optional (args ? sndlib) "--with-midi" )
+			++ (lib.optional (args ? alsaLib)  "--with-alsa")
+			++ (lib.optional (args ? jackaudio) "--with-jack" )
+                        ++ [ "--with-fftw" "--htmldir=$out/share/snd/html" "--with-doc-dir=$out/share/snd/html" ]
 			;
 	} null; /* null is a terminator for sumArgs */
 	in with localDefs;
-	let preBuild = FullDepEntry ("
+	let makeDocsWork = FullDepEntry ''
+                # hackish way to make html docs work
+                h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h"
+                patch -p1 < ${./doc.patch}
+                sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
+            '' [defEnsureDir];
+
+            preBuild = FullDepEntry (''
 		cp config.log /tmp/snd-config.log
-		export NIX_LDFLAGS=\"$NIX_LDFLAGS -L${libX11}/lib -lX11 \"
-	") [minInit doUnpack];
+		export NIX_LDFLAGS="$NIX_LDFLAGS -L${libX11}/lib -lX11"
+                
+            '') [minInit doUnpack makeDocsWork];
 in
 stdenv.mkDerivation rec {
 	name = "Snd-9.4";
 	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare]);
+		(textClosure localDefs [doConfigure preBuild makeDocsWork doMakeInstall doForceShare  ]);
 	meta = {
 		description = "Snd sound editor.";
-    homepage = http://ccrma.stanford.edu/software/snd;
+                homepage = http://ccrma.stanford.edu/software/snd;
 		inherit src;
 	};
 }