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

qtox: Fix compilation on darwin, remove parallelBuilds, cleanups

Browse Source
This commit is contained in:
Sandro Jäckel 2020-11-26 20:14:13 +01:00
parent 2959bb7028
commit b224b4db27
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -1,24 +1,19 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, libtoxcore
, libpthreadstubs, libXdmcp, libXScrnSaver
{ 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 ? null }:
, AVFoundation }:
let
version = "1.17.3";
rev = "v${version}";
in mkDerivation {
mkDerivation rec {
pname = "qtox";
inherit version;
version = "1.17.3";
src = fetchFromGitHub {
owner = "qTox";
repo = "qTox";
rev = "v${version}";
sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp";
inherit rev;
};
buildInputs = [
@ -27,21 +22,20 @@ in mkDerivation {
qtbase qtsvg qttranslations
ffmpeg_3 filter-audio libexif libopus libsodium
libvpx openal pcre qrencode sqlcipher
] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;
] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ;
nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkg-config qttools ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl ];
cmakeFlags = [
"-DGIT_DESCRIBE=${rev}"
"-DGIT_DESCRIBE=v${version}"
"-DENABLE_STATUSNOTIFIER=False"
"-DENABLE_GTK_SYSTRAY=False"
"-DENABLE_APPINDICATOR=False"
"-DTIMESTAMP=1"
];
meta = with lib; {
meta = with stdenv.lib; {
description = "Qt Tox client";
homepage = "https://tox.chat";
license = licenses.gpl3;

4
pkgs/top-level/all-packages.nix
View File

@ -23605,7 +23605,9 @@ in
qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox {
inherit (darwin.apple_sdk.frameworks) AVFoundation;
};
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };