From 38d115bc71ff33aea1e350827127c9396d9be818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 5 Jan 2016 09:59:26 +0100
Subject: [PATCH] guvcview: add pulseaudioSupport option (default true)

---
 pkgs/os-specific/linux/guvcview/default.nix | 7 +++++--
 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 940a627e5c29..40c9bdaaeacb 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 39ca0bdb4a01..f705e17b309d 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 { };