diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:17 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:17 +0000 |
| commit | 23cfa1d290e5806f7f459c960350540f0701767b (patch) | |
| tree | 1e9639383b80f74ce5f16872e5ceda457c73026b | |
| parent | 04551d263c8b22a07e5c82ee2982ba3caf2fffd8 (diff) | |
| download | nixpkgs-23cfa1d290e5806f7f459c960350540f0701767b.tar nixpkgs-23cfa1d290e5806f7f459c960350540f0701767b.tar.gz nixpkgs-23cfa1d290e5806f7f459c960350540f0701767b.tar.bz2 nixpkgs-23cfa1d290e5806f7f459c960350540f0701767b.tar.lz nixpkgs-23cfa1d290e5806f7f459c960350540f0701767b.tar.xz nixpkgs-23cfa1d290e5806f7f459c960350540f0701767b.tar.zst nixpkgs-23cfa1d290e5806f7f459c960350540f0701767b.zip | |
guvcview: move defaults to package file
| -rw-r--r-- | pkgs/os-specific/linux/guvcview/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 1afd1078c03..acafa0376f5 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, intltool, pkgconfig +{ config, stdenv, fetchurl, intltool, pkgconfig , gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl -, pulseaudioSupport ? true, libpulseaudio ? null }: +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null }: assert pulseaudioSupport -> libpulseaudio != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 487456ba58a..2884e80e4c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17534,9 +17534,7 @@ in gv = callPackage ../applications/misc/gv { }; - guvcview = callPackage ../os-specific/linux/guvcview { - pulseaudioSupport = config.pulseaudio or true; - }; + guvcview = callPackage ../os-specific/linux/guvcview { }; gxmessage = callPackage ../applications/misc/gxmessage { }; |