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
|
{ lib
|
||||||
, libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver
|
, stdenv
|
||||||
, qtbase, qtsvg, qttools, qttranslations
|
, mkDerivation
|
||||||
, ffmpeg_3, filter-audio, libexif, libsodium, libopus
|
, fetchFromGitHub
|
||||||
, libvpx, openal, pcre, qrencode, sqlcipher
|
, cmake
|
||||||
, AVFoundation }:
|
, 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 {
|
mkDerivation rec {
|
||||||
pname = "qtox";
|
pname = "qtox";
|
||||||
|
@ -18,11 +39,23 @@ mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libtoxcore
|
libtoxcore
|
||||||
libpthreadstubs libXdmcp libXScrnSaver
|
libpthreadstubs
|
||||||
qtbase qtsvg qttranslations
|
libXdmcp
|
||||||
ffmpeg_3 filter-audio libexif libopus libsodium
|
libXScrnSaver
|
||||||
libvpx openal pcre qrencode sqlcipher
|
qtbase
|
||||||
] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;
|
qtsvg
|
||||||
|
qttranslations
|
||||||
|
ffmpeg
|
||||||
|
filter-audio
|
||||||
|
libexif
|
||||||
|
libopus
|
||||||
|
libsodium
|
||||||
|
libvpx
|
||||||
|
openal
|
||||||
|
pcre
|
||||||
|
qrencode
|
||||||
|
sqlcipher
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [ AVFoundation ];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config qttools ]
|
nativeBuildInputs = [ cmake pkg-config qttools ]
|
||||||
++ lib.optionals stdenv.isDarwin [ perl ];
|
++ lib.optionals stdenv.isDarwin [ perl ];
|
||||||
|
|
Loading…
Reference in a new issue