From de9017ee68dfa4aaf4f7801b40cf377780d073df Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 3 Feb 2017 18:20:14 +0300 Subject: [PATCH] vokoscreen: don't use qt.full --- pkgs/applications/video/vokoscreen/default.nix | 15 ++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 7a9ea5f9095..204580b108f 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, pkgconfig, qt5, alsaLib, libv4l, xorg +, pkgconfig, qtbase, qttools, qmakeHook, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: @@ -12,13 +12,14 @@ stdenv.mkDerivation { }; buildInputs = [ - alsaLib.dev - libv4l.dev + alsaLib + libv4l pkgconfig - qt5.full - qt5.qmakeHook - qt5.qtx11extras - xorg.libXrandr.dev + qtbase + qttools + qmakeHook + qtx11extras + libXrandr ]; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361b4408fd1..e657e9686eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17831,7 +17831,7 @@ with pkgs; vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; - vokoscreen = callPackage ../applications/video/vokoscreen { }; + vokoscreen = qt5.callPackage ../applications/video/vokoscreen { }; wavegain = callPackage ../applications/audio/wavegain { };