mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-30 16:53:40 +00:00
libcanberra: Use the right GTK+ version, use GThread as well, disable OSS support (recommended).
svn path=/nixpkgs/trunk/; revision=13822
This commit is contained in:
parent
3e20a89b3d
commit
7137c6dea8
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, libtool, gtk
|
{ stdenv, fetchurl, pkgconfig, libtool, gtk, gthread
|
||||||
, alsaLib, pulseaudio, gstreamer, libvorbis }:
|
, alsaLib, pulseaudio, gstreamer, libvorbis }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ pkgconfig libtool gtk alsaLib pulseaudio gstreamer libvorbis ];
|
buildInputs = [ pkgconfig libtool gtk alsaLib pulseaudio gstreamer libvorbis ];
|
||||||
|
|
||||||
|
configureFlags = "--disable-oss";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";
|
description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications";
|
||||||
|
|
||||||
|
@ -3209,7 +3209,7 @@ let
|
|||||||
|
|
||||||
libcanberra = import ../development/libraries/libcanberra {
|
libcanberra = import ../development/libraries/libcanberra {
|
||||||
inherit fetchurl stdenv pkgconfig libtool alsaLib pulseaudio libvorbis;
|
inherit fetchurl stdenv pkgconfig libtool alsaLib pulseaudio libvorbis;
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs214) gtk gthread;
|
||||||
gstreamer = gst_all.gstreamer;
|
gstreamer = gst_all.gstreamer;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user