diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2c0dbd5f3f0..cdd428a29c7 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -32,6 +32,7 @@ , libkipi , libksane , liblqr1 +, libqtav , libusb1 , marble , libGL @@ -72,6 +73,7 @@ mkDerivation rec { libkipi libksane liblqr1 + libqtav libusb1 libGL libGLU diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 43489e8e850..fc577d7e508 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools , libGL, libX11 -, libass, openal, ffmpeg_3, libuchardet +, libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -9,19 +9,19 @@ with lib; mkDerivation rec { pname = "libqtav"; - version = "1.12.0"; + version = "git-2020-09-10"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 libGL libX11 - libass openal ffmpeg_3 libuchardet + libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; src = fetchFromGitHub { - sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2"; - rev = "v${version}"; + sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3"; + rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a"; repo = "QtAV"; owner = "wang-bin"; fetchSubmodules = true; @@ -46,6 +46,5 @@ mkDerivation rec { homepage = "http://www.qtav.org/"; maintainers = [ maintainers.jraygauthier ]; platforms = platforms.linux; - broken = !(lib.versionOlder qtbase.version "5.13"); }; }