public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use libpulseaudio instead of pulseaudio

Browse Source
This commit is contained in:
William A. Kennington III
2015-05-29 14:32:56 -07:00
parent cd52c04456
commit b07929b0a3
87 changed files with 184 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gstreamer/good/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, libv4l, libdv, libavc1394, libiec61883
, libvpx, speex, flac, taglib
, cairo, gdk_pixbuf, aalib, libcaca
, libsoup, pulseaudio, libintlOrEmpty
, libsoup, libpulseaudio, libintlOrEmpty
}:
let
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
libsoup
]
++ libintlOrEmpty
++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ];
++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
LDFLAGS = optionalString stdenv.isDarwin "-lintl";
}
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
, # Whether to build no plugins that have external dependencies
# (except the PulseAudio plugin).
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base ]
++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ]
++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ]
++ libintlOrEmpty
++ stdenv.lib.optionals (!minimalDeps)
[ aalib libcaca cairo libdv flac libjpeg libpng speex