dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #98796 from callahad/qtav

Browse Source 
libqtav: 1.12.0 -> git-2020-09-10
This commit is contained in:
Thomas Tuegel 2020-09-26 06:15:24 -05:00 committed by GitHub
commit d0636ea72e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/digikam/default.nix
View File

@ -32,6 +32,7 @@
, libkipi , libkipi
, libksane , libksane
, liblqr1 , liblqr1
, libqtav
, libusb1 , libusb1
, marble , marble
, libGL , libGL
@ -72,6 +73,7 @@ mkDerivation rec {
libkipi libkipi
libksane libksane
liblqr1 liblqr1
libqtav
libusb1 libusb1
libGL libGL
libGLU libGLU

11
pkgs/development/libraries/libqtav/default.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
, qtbase, qtmultimedia, qtquick1, qttools , qtbase, qtmultimedia, qtquick1, qttools
, libGL, libX11 , libGL, libX11
, libass, openal, ffmpeg_3, libuchardet , libass, openal, ffmpeg, libuchardet
, alsaLib, libpulseaudio, libva , alsaLib, libpulseaudio, libva
}: }:
@ -9,19 +9,19 @@ with lib;
mkDerivation rec { mkDerivation rec {
pname = "libqtav"; pname = "libqtav";
version = "1.12.0"; version = "git-2020-09-10";
nativeBuildInputs = [ extra-cmake-modules qttools ]; nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [ buildInputs = [
qtbase qtmultimedia qtquick1 qtbase qtmultimedia qtquick1
libGL libX11 libGL libX11
libass openal ffmpeg_3 libuchardet libass openal ffmpeg libuchardet
alsaLib libpulseaudio libva alsaLib libpulseaudio libva
]; ];
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2"; sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3";
rev = "v${version}"; rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a";
repo = "QtAV"; repo = "QtAV";
owner = "wang-bin"; owner = "wang-bin";
fetchSubmodules = true; fetchSubmodules = true;
@ -46,6 +46,5 @@ mkDerivation rec {
homepage = "http://www.qtav.org/"; homepage = "http://www.qtav.org/";
maintainers = [ maintainers.jraygauthier ]; maintainers = [ maintainers.jraygauthier ];
platforms = platforms.linux; platforms = platforms.linux;
broken = !(lib.versionOlder qtbase.version "5.13");
}; };
} }