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

qtox: 1.13.1 -> 1.15.0

Browse Source
This commit is contained in:
Peter Hoeg 2018-04-19 18:20:27 +08:00
parent 058df14f81
commit 88454d73b0
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,23 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, { stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
libtoxcore, , libtoxcore
libpthreadstubs, libXdmcp, libXScrnSaver, , libpthreadstubs, libXdmcp, libXScrnSaver
qtbase, qtsvg, qttools, qttranslations, , qtbase, qtsvg, qttools, qttranslations
ffmpeg, filter-audio, libexif, libsodium, libopus, , ffmpeg, filter-audio, libexif, libsodium, libopus
libvpx, openal, pcre, qrencode, sqlcipher }: , libvpx, openal, pcre, qrencode, sqlcipher
, AVFoundation ? null }:
mkDerivation rec { let
version = "1.15.0";
rev = "v${version}";
in mkDerivation rec {
name = "qtox-${version}"; name = "qtox-${version}";
version = "1.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qTox"; owner = "qTox";
repo = "qTox"; repo = "qTox";
rev = "v${version}"; sha256 = "1garwnlmg452b0bwx36rsh08s15q3zylb26l01iiwg4l9vcaldh9";
sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; inherit rev;
}; };
buildInputs = [ buildInputs = [
@ -22,17 +26,18 @@ mkDerivation rec {
qtbase qtsvg qttranslations qtbase qtsvg qttranslations
ffmpeg filter-audio libexif libopus libsodium ffmpeg filter-audio libexif libopus libsodium
libvpx openal pcre qrencode sqlcipher libvpx openal pcre qrencode sqlcipher
]; ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;
nativeBuildInputs = [ cmake pkgconfig qttools ]; nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = [ cmakeFlags = [
"-DGIT_DESCRIBE=${version}" "-DGIT_DESCRIBE=${rev}"
"-DENABLE_STATUSNOTIFIER=False" "-DENABLE_STATUSNOTIFIER=False"
"-DENABLE_GTK_SYSTRAY=False" "-DENABLE_GTK_SYSTRAY=False"
"-DENABLE_APPINDICATOR=False" "-DENABLE_APPINDICATOR=False"
"-DTIMESTAMP=1"
]; ];
meta = with lib; { meta = with lib; {

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

@ -17461,7 +17461,7 @@ with pkgs;
qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { ffmpeg = ffmpeg_2; }; qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };