From 443bb3960a64f1067aca14e99a40234a40f0f5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 17 Jan 2009 21:17:57 +0000
Subject: [PATCH] PulseAudio: Use aDNS and X11 libraries.
svn path=/nixpkgs/trunk/; revision=13800
---
pkgs/servers/pulseaudio/default.nix | 7 ++++---
pkgs/top-level/all-packages.nix | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 705151d8987c..ec58da3f7fad 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
-, gconf, liboil, intltool, gettext
+, gconf, liboil, libX11, libICE, libSM, adns, intltool, gettext
, libsamplerate, libsndfile, speex }:
stdenv.mkDerivation rec {
@@ -11,13 +11,14 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- pkgconfig gnum4 gdbm libtool glib dbus hal avahi gconf liboil
+ pkgconfig gnum4 gdbm libtool glib dbus hal avahi gconf liboil adns
libsamplerate libsndfile speex
+ libX11 libICE libSM
intltool gettext
];
configureFlags = ''
- --disable-solaris --disable-jack --disable-bluez --disable-polkit --localstatedir=/var
+ --disable-solaris --disable-jack --disable-bluez --disable-polkit --with-x --localstatedir=/var
'';
meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1da8ebbaf616..66a7928c325a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5781,10 +5781,11 @@ let
};
pulseaudio = import ../servers/pulseaudio {
- inherit fetchurl stdenv pkgconfig gnum4 libtool gdbm
+ inherit fetchurl stdenv pkgconfig gnum4 libtool gdbm adns
dbus hal avahi liboil libsamplerate libsndfile speex
intltool gettext;
inherit (gtkLibs) glib;
+ inherit (xlibs) libX11 libICE libSM;
gconf = gnome.GConf;
};