From 344f2efc5f59d27d244c87738bb8521483a63646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 3 Mar 2010 14:27:17 +0000
Subject: [PATCH] libcanberra 0.23.

svn path=/nixpkgs/trunk/; revision=20353
---
 pkgs/development/libraries/libcanberra/default.nix | 12 ++++++++----
 pkgs/top-level/all-packages.nix                    |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index a3584a989a8d..f80ada89e7f8 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, pkgconfig, libtool, gtk, gthread
-, alsaLib, pulseaudio, gstreamer, libvorbis }:
+, alsaLib, pulseaudio, gstreamer, libvorbis, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "libcanberra-0.10";
+  name = "libcanberra-0.23";
 
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz";
-    sha256 = "0wl2hd8zqwzbbp4icng6siim85jb6hvczy9c6m92lh85wrcwpqxh";
+    sha256 = "0q09gasvm5dc9d4640lzb5nnmy2cpyi74aq83kjd3j4z58lczl57";
   };
 
-  buildInputs = [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis ];
+  buildInputs =
+    [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap ];
   propagatedBuildInputs = [ gtk ];
 
   configureFlags = "--disable-oss";
@@ -28,5 +29,8 @@ stdenv.mkDerivation rec {
     homepage = http://0pointer.de/lennart/projects/libcanberra/;
 
     license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c013d070c05e..520b4eba5aa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4098,7 +4098,8 @@ let
   };
 
   libcanberra = import ../development/libraries/libcanberra {
-    inherit fetchurl stdenv pkgconfig libtool alsaLib pulseaudio libvorbis;
+    inherit fetchurl stdenv pkgconfig libtool alsaLib pulseaudio
+      libvorbis libcap;
     inherit (gtkLibs) gtk gthread;
     gstreamer = gst_all.gstreamer;
   };