From 55d9f8d1e03f08f1e1af1d1174e70aa12de7011e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 2 Apr 2009 12:22:18 +0000 Subject: [PATCH] PulseAudio: Use ltdl from Libtool 1.5. svn path=/nixpkgs/branches/stdenv-updates/; revision=14832 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87ab0f4dc01..3b30ca3b224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6435,13 +6435,17 @@ let }; pulseaudio = import ../servers/pulseaudio { - inherit fetchurl stdenv pkgconfig gnum4 libtool gdbm + inherit fetchurl stdenv pkgconfig gnum4 gdbm dbus hal avahi liboil libsamplerate libsndfile speex intltool gettext; inherit (gtkLibs) glib; inherit (xlibs) libX11 libICE libSM; inherit (alsa) alsaLib; # Needs ALSA >= 1.0.17. gconf = gnome.GConf; + + # Work around Libtool 1.5 interaction with Ltdl 2.x + # ("undefined reference to lt__PROGRAM__LTX_preloaded_symbols"). + libtool = libtool_1_5; }; tomcat_connectors = import ../servers/http/apache-modules/tomcat-connectors {