diff options
-rw-r--r-- | pkgs/os-specific/linux/guvcview/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 940a627e5c2..40c9bdaaeac 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, intltool, gettext, pkgconfig -, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl }: +, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl +, pulseaudioSupport ? true, libpulseaudio ? null }: + +assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "2.0.2"; @@ -22,7 +25,7 @@ stdenv.mkDerivation rec { portaudio udev gsl - ]; + ] ++ stdenv.lib.optional pulseaudioSupport [ libpulseaudio ]; meta = { description = "A simple interface for devices supported by the linux UVC driver"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39ca0bdb4a0..f705e17b309 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12079,7 +12079,9 @@ let gv = callPackage ../applications/misc/gv { }; - guvcview = callPackage ../os-specific/linux/guvcview { }; + guvcview = callPackage ../os-specific/linux/guvcview { + pulseaudioSupport = config.pulseaudio or true; + }; gxmessage = callPackage ../applications/misc/gxmessage { }; |