summary refs log tree commit diff
path: root/pkgs/misc/jackaudio
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-10-06 15:24:20 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-10-06 15:24:20 +0200
commit741bf840dad05cd1728481045466811ae8ae8281 (patch)
tree93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/misc/jackaudio
parentfe195af94462a6769f2e2c38c1d5739337c20d57 (diff)
downloadnixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.gz
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.lz
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.xz
nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.zst
nixpkgs-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/misc/jackaudio')
-rw-r--r--pkgs/misc/jackaudio/jack1.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 4250efcb6a2..1c5c78548f5 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ optAlsaLib optDb optLibffado optCelt ];
-  propagatedBuildInputs = [ optLibuuid ];
+  buildInputs = [ optAlsaLib optDb optLibuuid optLibffado optCelt ];
   
   meta = with stdenv.lib; {
     description = "JACK audio connection kit";