From 032bd0fd13a1e055c90cd8b3860cd2f6011f1396 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 20:50:09 +0100 Subject: [PATCH] webcamoid: migrate to Qt5.15 rewrite without stdenv --- pkgs/applications/video/webcamoid/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index aa559215fe8..a0d25f2ec1e 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: @@ -29,7 +29,7 @@ mkDerivation rec { "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Webcam Capture Software"; longDescription = "Webcamoid is a full featured and multiplatform webcam suite."; homepage = "https://github.com/webcamoid/webcamoid/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a06f67c7f1b..712f10edc34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24376,7 +24376,7 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; + webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};