Merge master into x-updates

Conflicts (auto-solved): pkgs/os-specific/linux/alsa-plugins/default.nix
2014-06-20 00:24:38 +02:00
parent 219cae447d ca545ac8ec
commit 3ec2cea214
67 changed files with 907 additions and 235 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
+{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }:

 stdenv.mkDerivation rec {
  name = "alsa-plugins-1.0.28";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  # ToDo: a52, etc.?
  buildInputs =
-    [ pkgconfig alsaLib ]
+    [ pkgconfig alsaLib libogg ]
    ++ lib.optional (pulseaudio != null) pulseaudio
    ++ lib.optional (jackaudio != null) jackaudio;