Author: eelco
Date: Tue Jul 26 00:05:10 2011
New Revision: 27956
URL: https://svn.nixos.org/websvn/nix/?rev=27956&sc=1
Log:
* alsa-plugins updated to 1.0.24.
Modified:
nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/alsa-plugins/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/alsa-plugins/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/alsa-plugins/default.nix
Tue Jul 26 00:04:46 2011 (r27955)
+++ nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/alsa-plugins/default.nix
Tue Jul 26 00:05:10 2011 (r27956)
@@ -1,21 +1,21 @@
-{stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio, jackaudio}:
-stdenv.mkDerivation {
- name = "alsa-plugins-1.0.23";
+{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ?
null }:
+
+stdenv.mkDerivation rec {
+ name = "alsa-plugins-1.0.24";
src = fetchurl {
- url = ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-1.0.23.tar.bz2;
- sha256 = "10ri5dpmhk028r0qvajswh2xl40kjd600h7hykq03vrkmn8jf6sw";
+ url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2";;
+ sha256 = "0qqjhqviv07456kshhm5dd132x81i9qb60vw24zhib7y5pmi53ps";
};
- # TODO make backends such as jack, pulseaudio optional
- buildInputs = [pkgconfig alsaLib pulseaudio jackaudio];
+ buildInputs =
+ [ pkgconfig alsaLib ]
+ ++ stdenv.lib.optional (pulseaudio != null) pulseaudio
+ ++ stdenv.lib.optional (jackaudio != null) jackaudio;
meta = {
- description = "plugins for alsa eg conneckt jack, pluseaudio applications
easily to the daemons using alsa devices";
- longDescription = "
- use it like this: export ALSA_PLUGIN_DIRS=$(nix-build -A
alsaPlugins)/lib/alsa-lib
- ";
- homepage = http://alsa-project.org;
+ description = "Various plugins for ALSA";
+ homepage = http://alsa-project.org/;
license = "GPL2.1";
maintainers = [lib.maintainers.marcweber];
platforms = lib.platforms.linux;
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Tue Jul 26
00:04:46 2011 (r27955)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Tue Jul 26
00:05:10 2011 (r27956)
@@ -4834,7 +4834,10 @@
alsaLib = callPackage ../os-specific/linux/alsa-lib { };
- alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { };
+ alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
+ jackaudio = null;
+ };
+
alsaPluginWrapper = callPackage
../os-specific/linux/alsa-plugins/wrapper.nix { };
alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
