diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-02 05:08:07 +0200 |
commit | 6295a3ca36cc746e11c7b01fd47562fde3a703ec (patch) | |
tree | 18d9289564e8893a9d7e4df671e5226bcd2b0f0c /pkgs/os-specific/linux/alsa-plugins | |
parent | 91b53aaebc0ca2e80d073459324515879e300f34 (diff) | |
parent | fb565f1a4ea2a71debe48e206ef6c2d032bba0a3 (diff) |
Merge recent master into x-updates
Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 352576fbdf23f..0bb96c343df4f 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, libogg, pulseaudio ? null, jackaudio ? null }: +{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }: stdenv.mkDerivation rec { name = "alsa-plugins-1.0.28"; @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig alsaLib libogg ] ++ lib.optional (pulseaudio != null) pulseaudio - ++ lib.optional (jackaudio != null) jackaudio; + ++ lib.optional (jack2 != null) jack2; meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; - license = licenses.gpl2; + license = licenses.lgpl21; maintainers = [maintainers.marcweber]; platforms = platforms.linux; }; |