diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-27 12:42:15 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-29 14:32:56 -0700 |
| commit | b07929b0a389541a7272deacbd305de2b48cce90 (patch) | |
| tree | 40231bbf06277769098feb79963733610a13fbd8 /pkgs/applications/networking/remote | |
| parent | cd52c044568bdf1108428698048a9af92dc0b625 (diff) | |
Use libpulseaudio instead of pulseaudio
Diffstat (limited to 'pkgs/applications/networking/remote')
| -rw-r--r-- | pkgs/applications/networking/remote/freerdp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/remote/freerdp/unstable.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 092e6f53e4930..f773cf6755e25 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -15,7 +15,7 @@ #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt , libXinerama , libXv -, pulseaudioSupport ? true, pulseaudio +, pulseaudioSupport ? true, libpulseaudio }: assert printerSupport -> cups != null; diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index e66f78f2602db..cc6ec9bd23155 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , substituteAll -, pulseaudio ? null, cups ? null, pcsclite ? null +, libpulseaudio ? null, cups ? null, pcsclite ? null , buildServer ? true, optimize ? true }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib - alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite + alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite ]; doCheck = false; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DWITH_CUNIT=OFF" - ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON" + ] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON" ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON" ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" |