From 98ab3f90caff960fd0c735452d7dbfd83cea4464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 1 Apr 2009 21:59:12 +0000 Subject: [PATCH] libao: Build against PulseAudio. svn path=/nixpkgs/branches/stdenv-updates/; revision=14828 --- pkgs/development/libraries/libao/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 6411657c6b69..264c51ef4797 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig}: +{ stdenv, fetchurl, pkgconfig, pulseaudio }: stdenv.mkDerivation { name = "libao-0.8.8"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954"; }; - buildInputs = [pkgconfig]; + buildInputs = [ pkgconfig pulseaudio ]; meta = { longDescription = '' @@ -16,6 +16,6 @@ stdenv.mkDerivation { platforms. ''; homepage = http://xiph.org/ao/; - license = "GPL"; + license = "GPLv2+"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b1e63074b60..87ab0f4dc01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3208,7 +3208,7 @@ let }; libao = import ../development/libraries/libao { - inherit stdenv fetchurl pkgconfig; + inherit stdenv fetchurl pkgconfig pulseaudio; }; libarchive = selectVersion ../development/libraries/libarchive "2.4.12" {