summary refs log tree commit diff
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2020-04-25 21:14:40 +0300
committerDoron Behar <doron.behar@gmail.com>2020-04-25 21:14:40 +0300
commit59588b68cd185a21b917daabc057dcd42a6803d8 (patch)
treed6958d8b91f3a5a940080637c6948edb022558ac
parentf04b40ae4be7cb0790839d4539baf636639edbed (diff)
downloadnixpkgs-59588b68cd185a21b917daabc057dcd42a6803d8.tar
nixpkgs-59588b68cd185a21b917daabc057dcd42a6803d8.tar.gz
nixpkgs-59588b68cd185a21b917daabc057dcd42a6803d8.tar.bz2
nixpkgs-59588b68cd185a21b917daabc057dcd42a6803d8.tar.lz
nixpkgs-59588b68cd185a21b917daabc057dcd42a6803d8.tar.xz
nixpkgs-59588b68cd185a21b917daabc057dcd42a6803d8.tar.zst
nixpkgs-59588b68cd185a21b917daabc057dcd42a6803d8.zip
guvcview: use libsForQt5.callPackage
-rw-r--r--pkgs/os-specific/linux/guvcview/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 0efdbcede48..d780cade786 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -16,7 +16,7 @@
 , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
 , libpulseaudio ? null
 , useQt ? false
-, qt5 ? null
+, qtbase ? null
 , wrapQtAppsHook ? null
 # can be turned off if used as a library
 , useGtk ? true
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ]
     ++ stdenv.lib.optionals (useGtk) [ gtk3 ]
     ++ stdenv.lib.optionals (useQt) [
-      qt5.qtbase
+      qtbase
     ]
   ;
   configureFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a05c25bd86..5b773bf5929 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19848,7 +19848,7 @@ in
 
   gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { };
 
-  guvcview = callPackage ../os-specific/linux/guvcview { };
+  guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
 
   gxmessage = callPackage ../applications/misc/gxmessage { };