diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/libqtav | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libqtav')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libqtav/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libqtav/default.nix b/nixpkgs/pkgs/development/libraries/libqtav/default.nix index 00a87402fa3f..fc577d7e5082 100644 --- a/nixpkgs/pkgs/development/libraries/libqtav/default.nix +++ b/nixpkgs/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; @@ -48,4 +48,3 @@ mkDerivation rec { platforms = platforms.linux; }; } - |