From 7137c6dea806c116f84ed5a53eb207dba0309da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 22 Jan 2009 22:34:06 +0000
Subject: [PATCH] libcanberra: Use the right GTK+ version, use GThread as well,
disable OSS support (recommended).
svn path=/nixpkgs/trunk/; revision=13822
---
pkgs/development/libraries/libcanberra/default.nix | 4 +++-
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index abe062af5366..f36bfa0d1441 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk
+{ stdenv, fetchurl, pkgconfig, libtool, gtk, gthread
, alsaLib, pulseaudio, gstreamer, libvorbis }:
stdenv.mkDerivation rec {
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig libtool gtk alsaLib pulseaudio gstreamer libvorbis ];
+ configureFlags = "--disable-oss";
+
meta = {
description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e87773f3f799..78b08707858b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3209,7 +3209,7 @@ let
libcanberra = import ../development/libraries/libcanberra {
inherit fetchurl stdenv pkgconfig libtool alsaLib pulseaudio libvorbis;
- inherit (gtkLibs) gtk;
+ inherit (gtkLibs214) gtk gthread;
gstreamer = gst_all.gstreamer;
};