summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-07-28 12:07:44 +0200
committerPeter Simons <simons@cryp.to>2014-07-28 20:32:52 +0200
commitbdb77826d98544ab37741f740dd3516023924b27 (patch)
tree7b65a3782285d5e65ebc4306d1e1261aaacef03b /pkgs/development
parent7325894d72e573a3eb6dea89dcf1dd82a39cb578 (diff)
downloadnixpkgs-bdb77826d98544ab37741f740dd3516023924b27.tar
nixpkgs-bdb77826d98544ab37741f740dd3516023924b27.tar.gz
nixpkgs-bdb77826d98544ab37741f740dd3516023924b27.tar.bz2
nixpkgs-bdb77826d98544ab37741f740dd3516023924b27.tar.lz
nixpkgs-bdb77826d98544ab37741f740dd3516023924b27.tar.xz
nixpkgs-bdb77826d98544ab37741f740dd3516023924b27.tar.zst
nixpkgs-bdb77826d98544ab37741f740dd3516023924b27.zip
Remove obsolete jackaudio version 1.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/interpreters/supercollider/default.nix4
-rw-r--r--pkgs/development/libraries/aubio/default.nix4
-rw-r--r--pkgs/development/libraries/dssi/default.nix2
-rw-r--r--pkgs/development/libraries/haskell/jack/default.nix4
-rw-r--r--pkgs/development/libraries/mlt/default.nix4
5 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index a8c967b5967..59fb9268372 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig
-, jack2, libsndfile, fftw, curl
+, jackaudio, libsndfile, fftw, curl
 , libXt, qt, readline
 , useSCEL ? false, emacs
 }:
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ 
-    jack2 libsndfile fftw curl libXt qt readline ]
+    jackaudio libsndfile fftw curl libXt qt readline ]
     ++ optional useSCEL emacs;
 }
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 7a5351da10e..53ff6572052 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate
+{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate
 , libsndfile, pkgconfig, python
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python
+    alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python
   ];
 
   configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index ae276c6aa0a..951278b4433 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -1,5 +1,5 @@
 x@{builderDefsPackage
-  , ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
+  , ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM
   , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
   , ...}:
 builderDefsPackage
diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix
index 2e6b6ee1aa3..acb4b0b7e57 100644
--- a/pkgs/development/libraries/haskell/jack/default.nix
+++ b/pkgs/development/libraries/haskell/jack/default.nix
@@ -1,6 +1,6 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, enumset, eventList, explicitException, jack2, midi
+{ cabal, enumset, eventList, explicitException, jackaudio, midi
 , nonNegative, transformers
 }:
 
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     enumset eventList explicitException midi nonNegative transformers
   ];
-  pkgconfigDepends = [ jack2 ];
+  pkgconfigDepends = [ jackaudio ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/JACK";
     description = "Bindings for the JACK Audio Connection Kit";
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 00d586a9f04..3d89d6c7d55 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate
+{ stdenv, fetchurl, SDL, frei0r, jackaudio, libav, libdv, libsamplerate
 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2
+    SDL frei0r jackaudio libav libdv libsamplerate libvorbis libxml2
     makeWrapper movit pkgconfig qt sox
   ];