diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:27:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:29:24 +0100 |
commit | a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch) | |
tree | ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/applications/audio | |
parent | 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff) | |
parent | a0070a9157d7d145eed22160cec2562d24032013 (diff) | |
download | nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2 nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/lastfmsubmitd/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/audio/moc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/projectm/default.nix | 51 | ||||
-rw-r--r-- | pkgs/applications/audio/snd/default.nix | 70 | ||||
-rw-r--r-- | pkgs/applications/audio/snd/doc.patch | 62 |
5 files changed, 93 insertions, 115 deletions
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix new file mode 100644 index 000000000000..314361329c75 --- /dev/null +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "lastfmsubmitd-${version}"; + namePrefix = ""; + version = "1.0.6"; + + src = fetchurl { + url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz"; + sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e"; + }; + + doCheck = false; + + installCommand = "python setup.py install --prefix=$out"; + + meta = { + homepage = "http://www.red-bean.com/decklin/lastfmsubmitd/"; + description = "An last.fm audio scrobbler and daemon"; + }; +} diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index de29f2d53e74..74ae3dcf22bb 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }: stdenv.mkDerivation rec { name = "moc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav libmodplug timidity libid3tag libtool ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix new file mode 100644 index 000000000000..2dd251ddd5bd --- /dev/null +++ b/pkgs/applications/audio/projectm/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, pkgconfig, cmake +, glew, ftgl, ttf_bitstream_vera +, withQt ? true, qt4 +, withLibvisual ? false, libvisual, SDL +, withJack ? false, jackaudio +, withPulseAudio ? true, pulseaudio +}: + +assert withJack -> withQt; +assert withPulseAudio -> withQt; + +stdenv.mkDerivation { + name = "projectm-2.1.0"; + + meta = { + description = "Music Visualizer"; + homepage = "http://projectm.sourceforge.net/"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + }; + + src = fetchurl { + url = "mirror://sourceforge/projectm/2.1.0/projectM-complete-2.1.0-Source.tar.gz"; + sha256 = "1vh6jk68a0jdb6qwppb6f8cbgmhnv2ba3bcavzfd6sq06gq08cji"; + }; + + patchPhase = '' + sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \ + src/projectM-libvisual/CMakeLists.txt + ''; + + nativeBuildInputs = [ pkgconfig cmake ]; + + cmakeFlags = '' + -DprojectM_FONT_MENU=${ttf_bitstream_vera}/share/fonts/truetype/VeraMono.ttf + -DprojectM_FONT_TITLE=${ttf_bitstream_vera}/share/fonts/truetype/Vera.ttf + -DINCLUDE-PROJECTM-TEST=OFF + -DINCLUDE-PROJECTM-QT=${if withQt then "ON" else "OFF"} + -DINCLUDE-PROJECTM-LIBVISUAL=${if withLibvisual then "ON" else "OFF"} + -DINCLUDE-PROJECTM-JACK=${if withJack then "ON" else "OFF"} + -DINCLUDE-PROJECTM-PULSEAUDIO=${if withPulseAudio then "ON" else "OFF"} + ''; + + buildInputs = with stdenv.lib; + [ glew ftgl ] + ++ optional withQt qt4 + ++ optionals withLibvisual [ libvisual SDL ] + ++ optional withJack jackaudio + ++ optional withPulseAudio pulseaudio + ; +} 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")); - } - - |