mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
Merge pull request #120839 from peterhoeg/f/qtox
qtox: ffmpeg_3 -> ffmpeg
This commit is contained in:
commit
be1783e755
1 changed files with 44 additions and 11 deletions
|
@ -1,9 +1,30 @@
|
|||
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl
|
||||
, libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver
|
||||
, qtbase, qtsvg, qttools, qttranslations
|
||||
, ffmpeg_3, filter-audio, libexif, libsodium, libopus
|
||||
, libvpx, openal, pcre, qrencode, sqlcipher
|
||||
, AVFoundation }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, perl
|
||||
, libtoxcore
|
||||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, libXScrnSaver
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qttranslations
|
||||
, ffmpeg
|
||||
, filter-audio
|
||||
, libexif
|
||||
, libsodium
|
||||
, libopus
|
||||
, libvpx
|
||||
, openal
|
||||
, pcre
|
||||
, qrencode
|
||||
, sqlcipher
|
||||
, AVFoundation
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qtox";
|
||||
|
@ -18,10 +39,22 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libtoxcore
|
||||
libpthreadstubs libXdmcp libXScrnSaver
|
||||
qtbase qtsvg qttranslations
|
||||
ffmpeg_3 filter-audio libexif libopus libsodium
|
||||
libvpx openal pcre qrencode sqlcipher
|
||||
libpthreadstubs
|
||||
libXdmcp
|
||||
libXScrnSaver
|
||||
qtbase
|
||||
qtsvg
|
||||
qttranslations
|
||||
ffmpeg
|
||||
filter-audio
|
||||
libexif
|
||||
libopus
|
||||
libsodium
|
||||
libvpx
|
||||
openal
|
||||
pcre
|
||||
qrencode
|
||||
sqlcipher
|
||||
] ++ lib.optionals stdenv.isDarwin [ AVFoundation ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools ]
|
||||
|
|
Loading…
Reference in a new issue