diff options
author | Song Wenwu <iyzsong@gmail.com> | 2014-01-09 15:24:11 +0800 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2014-01-11 19:40:24 +0100 |
commit | 6b7105d456c968880a36879b9456aa97b6218b0c (patch) | |
tree | 678448b643f6812d838d0faa3a4137b3a09caddb /pkgs/applications/audio | |
parent | 0209d478a8b350758c3c61b2344862f236d23d5a (diff) | |
download | nixlib-6b7105d456c968880a36879b9456aa97b6218b0c.tar nixlib-6b7105d456c968880a36879b9456aa97b6218b0c.tar.gz nixlib-6b7105d456c968880a36879b9456aa97b6218b0c.tar.bz2 nixlib-6b7105d456c968880a36879b9456aa97b6218b0c.tar.lz nixlib-6b7105d456c968880a36879b9456aa97b6218b0c.tar.xz nixlib-6b7105d456c968880a36879b9456aa97b6218b0c.tar.zst nixlib-6b7105d456c968880a36879b9456aa97b6218b0c.zip |
snd: update to 14.3
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/snd/default.nix | 70 | ||||
-rw-r--r-- | pkgs/applications/audio/snd/doc.patch | 62 |
2 files changed, 19 insertions, 113 deletions
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index a49bfd9cccf4..52cd2ad35ce1 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -1,58 +1,26 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - fullDepEntry = args.fullDepEntry; +{ stdenv, fetchurl, pkgconfig +, gtk2, alsaLib +, fftw, gsl +}: - version = lib.attrByPath ["version"] "9.4" args; - buildInputs = with args; [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" ] - ; -in -rec { - src = fetchurl { - url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "preBuild" "makeDocsWork" - "doMakeInstall" "doForceShare"]; - - makeDocsWork = fullDepEntry '' - # hackish way to make html docs work - h="$out/share/snd/html"; mkdir -p "$h"; cp *.html "$h" - patch -p1 < ${./doc.patch} - sed "s@HTML-DIR@$h@" -i index.scm snd-help.c - '' ["defEnsureDir"]; - - preBuild = fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11" - '') ["minInit" "doUnpack" "makeDocsWork"]; +stdenv.mkDerivation rec { + name = "snd-14.3"; - name = "snd-" + version; meta = { description = "Sound editor"; homepage = http://ccrma.stanford.edu/software/snd; - inherit src; + platforms = stdenv.lib.platforms.linux; }; + + src = fetchurl { + url = "mirror://sourceforge/snd/${name}.tar.gz"; + sha256 = "04shk34pza507kvm40dc6sdz5jz533z4q2h7m9hgqvw1r3f57ms6"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + gtk2 alsaLib + fftw gsl + ]; } diff --git a/pkgs/applications/audio/snd/doc.patch b/pkgs/applications/audio/snd/doc.patch deleted file mode 100644 index 4c40151e9881..000000000000 --- a/pkgs/applications/audio/snd/doc.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/index.scm b/index.scm -index 2148a58..713939c 100644 ---- a/index.scm -+++ b/index.scm -@@ -18,24 +18,7 @@ and if one is found, and the Snd documentation can be found, calls (html-program - (lambda (n) - ;; look for doc on current dir, then html dir, then global dir - ;; snd.html is what we'll search for -- (let ((dir (if (file-exists? "snd.html") -- (getcwd) -- (if (and (string? (html-dir)) -- (file-exists? (string-append (html-dir) "/snd.html"))) -- (html-dir) -- (if (file-exists? "/usr/share/doc/snd-9/snd.html") -- "/usr/share/doc/snd-9" -- (if (file-exists? "/usr/local/share/doc/snd-9/snd.html") -- "/usr/local/share/doc/snd-9" -- (if (file-exists? "/usr/doc/snd-9/snd.html") -- "/usr/doc/snd-9" -- (if (file-exists? "/usr/share/doc/snd-8/snd.html") -- "/usr/share/doc/snd-8" -- (if (file-exists? "/usr/local/share/doc/snd-8/snd.html") -- "/usr/local/share/doc/snd-8" -- (if (file-exists? "/usr/doc/snd-8/snd.html") -- "/usr/doc/snd-8" -- #f)))))))))) -+ (let (dir "HTML-DIR") - (if dir - (if (or (string=? (html-program) "netscape") - (string=? (html-program) "mozilla") -diff --git a/snd-help.c b/snd-help.c -index a6557e0..a40a02e 100644 ---- a/snd-help.c -+++ b/snd-help.c -@@ -3554,26 +3554,7 @@ static char *doc_files[DOC_DIRECTORIES] = { - - static char *html_directory(void) - { -- int i; -- if (mus_file_probe("snd.html")) -- return(mus_getcwd()); -- if (html_dir(ss)) -- { -- bool happy; -- char *hd = NULL; -- hd = (char *)CALLOC(snd_strlen(html_dir(ss)) + 16, sizeof(char)); -- sprintf(hd, html_dir(ss), "/snd.html"); -- happy = mus_file_probe(hd); -- FREE(hd); -- if (happy) return(copy_string(html_dir(ss))); -- } --#ifdef MUS_DEFAULT_DOC_DIR -- if (mus_file_probe(MUS_DEFAULT_DOC_DIR "/snd.html")) -- return(copy_string(MUS_DEFAULT_DOC_DIR "/snd.html")); --#endif -- for (i = 0; i < DOC_DIRECTORIES; i++) -- if (mus_file_probe(doc_files[i])) return(copy_string(doc_directories[i])); -- return(NULL); -+ return (copy_string ("HTML-DIR")); - } - - |