diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-20 00:24:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-20 00:24:38 +0200 |
| commit | 3ec2cea214323f9b4a43c46b66dfa57ff465447c (patch) | |
| tree | 7e580446d07e86e8d7da03f3895f8dcf04045ef8 /pkgs/os-specific/linux/alsa-plugins | |
| parent | 219cae447dabe459da1510c5815c01afdc94aac4 (diff) | |
| parent | ca545ac8ecf4f4a7b93e70244f4b01779f117598 (diff) | |
| download | nixpkgs-3ec2cea214323f9b4a43c46b66dfa57ff465447c.tar nixpkgs-3ec2cea214323f9b4a43c46b66dfa57ff465447c.tar.gz nixpkgs-3ec2cea214323f9b4a43c46b66dfa57ff465447c.tar.bz2 nixpkgs-3ec2cea214323f9b4a43c46b66dfa57ff465447c.tar.lz nixpkgs-3ec2cea214323f9b4a43c46b66dfa57ff465447c.tar.xz nixpkgs-3ec2cea214323f9b4a43c46b66dfa57ff465447c.tar.zst nixpkgs-3ec2cea214323f9b4a43c46b66dfa57ff465447c.zip | |
Merge master into x-updates
Conflicts (auto-solved): pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'pkgs/os-specific/linux/alsa-plugins')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-plugins/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 59520b18cf2..352576fbdf2 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -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; |