public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge recent master into x-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2014-08-02 05:08:07 +02:00
parent 91b53aaebc fb565f1a4e
commit 6295a3ca36
1391 changed files with 6647 additions and 5597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/alsa-plugins/default.nix
+3 -3
View File
@@ -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;
};