diff options
Diffstat (limited to 'pkgs/applications/audio')
21 files changed, 177 insertions, 73 deletions
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 3ab113c92e89..9476fbaf3359 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs -, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg +, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , mpg123, neon, faad2 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib - libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio + libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio libcddb ffmpeg makeWrapper mpg123 neon faad2 ]; diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 3997855a75b6..7113a169e808 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool , gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "beast-0.7.1"; src = fetchurl { - url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2; + url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l"; }; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index db1f7895f4b9..e19acab36b5a 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext - xlibs.xproto + alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext + xorg.xproto ]; preInstall = '' diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix new file mode 100644 index 000000000000..db6843f4535b --- /dev/null +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, ffmpeg, sox }: + +stdenv.mkDerivation rec { + name = "bs1770gain-${version}"; + version = "0.4.7"; + + src = fetchurl { + url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; + sha256 = "0dnypm7k4axc693g0z73n2mvycbzgc4lnj2am64xjzyg37my4qzz"; + }; + + buildInputs = [ ffmpeg sox ]; + + meta = { + description = "A audio/video loudness scanner implementing ITU-R BS.1770"; + license = stdenv.lib.licenses.gpl2Plus; + homepage = "http://bs1770gain.sourceforge.net/"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index f650b233c94b..fcd30e476cf3 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -2,9 +2,9 @@ let - version = "1.2.4"; + version = "1.2.5"; rev = "v${version}"; - sha256 = "1mccfs5dgmfqxa7wvvz2j3qdifh0kxwzcz8bb3pdwv3phrf8lvji"; + sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d"; reaperFork = { src = fetchFromGitHub { @@ -18,6 +18,18 @@ let }; }; + libqaudioextra = { + src = fetchFromGitHub { + sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1"; + rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3"; + repo = "libqaudioextra"; + owner = "gillesdegottex"; + }; + meta = with stdenv.lib; { + license = licenses.gpl3Plus; + }; + }; + in stdenv.mkDerivation { name = "dfasma-${version}"; @@ -32,6 +44,7 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' cp -Rv "${reaperFork.src}"/* external/REAPER + cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra ''; configurePhase = '' diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a590716537bc..72893dfb19a1 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 -, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }: +, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { name = "distrho-ports-git-2015-07-18"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 - xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext - xlibs.libXinerama xlibs.libXrender ladspa-sdk + xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext + xorg.libXinerama xorg.libXrender ladspa-sdk ]; buildPhase = '' diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 61c979534229..5d5b70a58985 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: +{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-2-${version}"; version = "beta7.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; }; - buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; + buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 025ca594dffe..4ccbb4256127 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = https://github.com/sampov2/foo-yc20; license = "BSD"; - maintainers = stdenv.lib.maintainers.magnetophon; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 2edc1c00ce67..7c69a25eb042 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac , libvorbis }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; + sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; } else fetchurl { url = archUrl name "i386"; - sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; + sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; }; unpackPhase = '' diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 0427283d54df..b0fbced22113 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }: +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }: stdenv.mkDerivation rec { name = "jaaa-${version}"; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index f6e798e0ea5b..dc90aeda47df 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, libav, libkeyfinder }: -let version = "2015-09-11"; in +let version = "2015-09-13"; in stdenv.mkDerivation rec { name = "keyfinder-cli-${version}"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; - rev = "94df5e6c012a2643a4e5eda49a80cdc57d2e1bb2"; - sha256 = "04276z5xrpgf1zga565awypy5r7g054fwl4x75l7j308x0xcp12j"; + rev = "8579282f15ab3ebad937fed398ec5c88843be03d"; + sha256 = "0jylykigxmsqvdny265k58vpxa4cqs1hq2f7mph1nl3apfx2shrh"; }; buildInputs = [ libav libkeyfinder ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { used to estimate the musical key of many different audio formats. ''; license = licenses.gpl3Plus; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index afd411089cd8..e316df4a8c1f 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.6.5"; + version = "0.6.7"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zfidkskmiqx1wfykinmr639lhd90s7b0rks6vaci4n56ml8y4ji"; + sha256 = "0yr1ib14qkgbsv839anpzkfbwkm6gg8wv4bf98ar7q5l2p2pv008"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index bb863d2501ce..0483882ccb09 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,40 +1,35 @@ -# Based on Richard Wallace's post here: http://comments.gmane.org/gmane.linux.distributions.nixos/14734 +{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify, gst_all_1 }: -{ fetchurl, stdenv, pythonPackages, gtk3, libnotify, gst_all_1 }: pythonPackages.buildPythonPackage rec { name = "pithos-${version}"; - version = "1.0.1"; + version = "1.1.1"; - src = fetchurl { - url = "https://github.com/pithos/pithos/archive/${version}.tar.gz"; - sha256 = "67b83927d5111067aefbf034d23880f96b1a2d300464e8491efa80e97e67f50f"; + src = fetchFromGitHub { + owner = "pithos"; + repo = "pithos"; + rev = version; + sha256 = "0373z7g1wd3g1xl8m4ipx5n2ka67a2wcn387nyk8yvgdikm14jm3"; }; postPatch = '' substituteInPlace setup.py --replace "/usr/share" "$out/share" ''; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad libnotify ]; - - pythonPath = with pythonPackages; [ pygobject3 dbus pylast ]; - - propogatedBuildInputs = pythonPath; + propagatedBuildInputs = + [ gtk3 gobjectIntrospection libnotify ] ++ + (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ + (with pythonPackages; [ pygobject3 pylast ]); postInstall = '' - wrapProgram "$out/bin/pithos" --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + wrapProgram "$out/bin/pithos" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; meta = with stdenv.lib; { - description = "Pandora player"; - - longDescription = '' - Pandora Internet Radio player for GNOME - ''; - - homepage = http://pithos.github.io/ ; - + description = "Pandora Internet Radio player for GNOME"; + homepage = http://pithos.github.io/; license = licenses.gpl3; - maintainers = with maintainers; [ obadz ]; }; } diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 1b9323c1a7ba..5bec7aa6dd04 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11 +{ stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper # transports , curl, libmms # input plugins @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ # basic requirements - cmake qt4 pkgconfig x11 + cmake qt4 pkgconfig xlibsWrapper # transports curl libmms # input plugins diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix new file mode 100644 index 000000000000..704f3f01c00e --- /dev/null +++ b/pkgs/applications/audio/renoise/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }: + +stdenv.mkDerivation rec { + name = "renoise"; + + buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + + src = + if builtins.currentSystem == "x86_64-linux" then + if demo then + fetchurl { + url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2"; + sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg"; + } + else + requireFile { + url = "http://backstage.renoise.com/frontend/app/index.html#/login"; + name = "rns_3_0_1_reg_x86_64.tar.gz"; + sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; + } + else if builtins.currentSystem == "i686-linux" then + if demo then + fetchurl { + url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2"; + sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58"; + } + else + requireFile { + url = "http://backstage.renoise.com/frontend/app/index.html#/login"; + name = "rns_3_0_1_reg_x86.tar.gz"; + sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; + } + else throw "platform is not suppored by Renoise"; + + installPhase = '' + cp -r Resources $out + + mkdir -p $out/lib/ + + mv $out/AudioPluginServer* $out/lib/ + + cp renoise $out/renoise + + for path in ${toString buildInputs}; do + ln -s $path/lib/*.so* $out/lib/ + done + + ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ + + mkdir $out/bin + ln -s $out/renoise $out/bin/renoise + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise + ''; + + meta = { + description = "modern tracker-based DAW"; + homepage = http://www.renoise.com/; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 9c41c88b0123..084d187c347c 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, fetchFromGitHub, -automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile +automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; }; - buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; meta = { description = "Rakarrak effects ported to LV2"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 005b3e1b60d3..2868d7609738 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , libgcrypt, chromium, udev, fontconfig , dbus, expat }: @@ -28,16 +28,16 @@ let qt4 stdenv.cc.cc udev - xlibs.libX11 - xlibs.libXcomposite - xlibs.libXdamage - xlibs.libXext - xlibs.libXfixes - xlibs.libXi - xlibs.libXrandr - xlibs.libXrender - xlibs.libXrender - xlibs.libXScrnSaver + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXrender + xorg.libXScrnSaver ]; in diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index a107dd9794b1..d450cce7b86f 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient -, libsndfile, libxcb, xlibs +, libsndfile, libxcb, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype - libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender + libxcb xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXft xorg.libXrender ]; makeFlags = [ diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 6e03bcb27fc4..32d5f1aa13e5 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -15,11 +15,11 @@ let quazipQt4 = quazip.override { qt = qt4; }; in stdenv.mkDerivation rec { name = "tomahawk-${version}"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { url = "http://download.tomahawk-player.org/${name}.tar.bz2"; - sha256 = "0kjzkq21g3jl1lvadsm7gf0zvpbsv208kqf76wg2hnbm4k1a02wj"; + sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g"; }; cmakeFlags = [ diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index e4e5b7ff81a3..1f85f4423548 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,6 +1,12 @@ -{stdenv, fetchurl, libogg, libvorbis, libao, pkgconfig, curl, glibc -, speex, flac}: +{ stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl +, speex, flac }: +let + debPatch = fetchzip { + url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-6.debian.tar.xz"; + sha256 = "1xmmpdvxyr84lazlg23c6ck5ic97ga2rkiqabb1d98ix2zdzyqz5"; + }; +in stdenv.mkDerivation { name = "vorbis-tools-1.4.0"; src = fetchurl { @@ -8,14 +14,23 @@ stdenv.mkDerivation { sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; }; - buildInputs = [ libogg libvorbis libao pkgconfig curl speex glibc flac ]; + postPatch = '' + for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir) + do patch -p1 < "$patch" + done + ''; + + buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac ]; - meta = { + meta = with stdenv.lib; { + description = "Extra tools for Ogg-Vorbis audio codec"; longDescription = '' A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; homepage = http://xiph.org/vorbis/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.all; }; } + diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 9aafae7a5f45..cd334c4254ff 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.5.1"; + version = "1.3.5.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1c7049pnvadxndk1rbja77kyr0rwnqca2546pxjnxksg923s5l8n"; + sha256 = "001xvwknsm1sv5lvwz7f6dgf57b8djbpwbyk2gfxjy9rzl5q53qr"; }; buildInputs = [ |