diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/applications/audio | |
parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) | |
download | nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.gz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2 nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.lz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.xz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.zst nixlib-741bf840dad05cd1728481045466811ae8ae8281.zip |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/audio/jackmix/default.nix | 35 |
2 files changed, 3 insertions, 40 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 67ec6b5a419e..6f25693f734e 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, - expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ + expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */ }: stdenv.mkDerivation rec { @@ -19,13 +19,11 @@ stdenv.mkDerivation rec { rm -r lib-src-rm/ ''; - configureFlags = "--with-libsamplerate"; - buildInputs = [ pkgconfig gettext wxGTK gtk expat alsaLib libsndfile soxr libid3tag - ffmpeg libmad lame libvorbis flac soundtouch - ]; #ToDo: detach sbsms + ffmpeg libmad lame libvorbis flac + ]; #ToDo: soundtouch, detach sbsms dontDisableStatic = true; doCheck = true; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix deleted file mode 100644 index 8176a3404702..000000000000 --- a/pkgs/applications/audio/jackmix/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: - -stdenv.mkDerivation rec { - name = "jackmix-0.5.2"; - src = fetchurl { - url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; - sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; - }; - - buildInputs = [ - pkgs.pkgconfig - pkgs.scons - pkgs.kde4.qt4 - pkgs.lash - jack - ]; - - buildPhase = '' - scons - ''; - installPhase = '' - mkdir -p $out/bin - cp jackmix/jackmix $out/bin - ''; - - meta = { - description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; - homepage = http://www.arnoldarts.de/jackmix/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; - platforms = stdenv.lib.platforms.linux; - }; -} - - |