cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libqtav: 1.12.0 -> git-2020-09-10

Browse source 
This un-breaks libqtav by upgrading it to the current upstream HEAD.
Previously, Qtav was broken by the Qt 5.12 -> 5.14 migration (#84232).
See commit 819bb63d5c

This also un-pins ffmpeg_3; libqtav works fine with current ffmpeg.

Digikam is the only derivation in nixpkgs that has referenced libqtav, thus
upgrading to a pre-release revision poses minimal risk.
This commit is contained in:
Dan Callahan 2020-09-26 08:36:14 +01:00
parent b21cd5bd26
commit 9cb5285c0a
No known key found for this signature in database
GPG key ID: 8D6DD713E9EBA7FD
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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");
};
}