diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-01-22 22:34:06 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-01-22 22:34:06 +0000 |
commit | 7137c6dea806c116f84ed5a53eb207dba0309da4 (patch) | |
tree | 3b4db793354adb270407c10638ea89dc362696bf /pkgs | |
parent | 3e20a89b3d2e0d72900fc69f0f9c3e83f18f04ac (diff) | |
download | nixlib-7137c6dea806c116f84ed5a53eb207dba0309da4.tar nixlib-7137c6dea806c116f84ed5a53eb207dba0309da4.tar.gz nixlib-7137c6dea806c116f84ed5a53eb207dba0309da4.tar.bz2 nixlib-7137c6dea806c116f84ed5a53eb207dba0309da4.tar.lz nixlib-7137c6dea806c116f84ed5a53eb207dba0309da4.tar.xz nixlib-7137c6dea806c116f84ed5a53eb207dba0309da4.tar.zst nixlib-7137c6dea806c116f84ed5a53eb207dba0309da4.zip |
libcanberra: Use the right GTK+ version, use GThread as well, disable OSS support (recommended).
svn path=/nixpkgs/trunk/; revision=13822
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libcanberra/default.nix | 4 | ||||
-rw-r--r-- | 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; }; |