diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2020-11-26 20:14:13 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2020-12-09 20:10:52 +0100 |
| commit | b224b4db27f88deb08216e8b59e004ad210a2515 (patch) | |
| tree | 14fc5db538bdbb780e868de5619d71f2cf443585 | |
| parent | 2959bb702852f707e6eacc16c9c5bbc919cc58ea (diff) | |
| download | nixpkgs-b224b4db27f88deb08216e8b59e004ad210a2515.tar nixpkgs-b224b4db27f88deb08216e8b59e004ad210a2515.tar.gz nixpkgs-b224b4db27f88deb08216e8b59e004ad210a2515.tar.bz2 nixpkgs-b224b4db27f88deb08216e8b59e004ad210a2515.tar.lz nixpkgs-b224b4db27f88deb08216e8b59e004ad210a2515.tar.xz nixpkgs-b224b4db27f88deb08216e8b59e004ad210a2515.tar.zst nixpkgs-b224b4db27f88deb08216e8b59e004ad210a2515.zip | |
qtox: Fix compilation on darwin, remove parallelBuilds, cleanups
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/qtox/default.nix | 38 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 19 insertions, 23 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 952182def26..2605d6dc081 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -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"; + owner = "qTox"; + repo = "qTox"; + rev = "v${version}"; sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp"; - inherit rev; }; buildInputs = [ @@ -27,25 +22,24 @@ in mkDerivation { qtbase qtsvg qttranslations ffmpeg_3 filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; - - nativeBuildInputs = [ cmake pkgconfig qttools ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ; - 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; + homepage = "https://tox.chat"; + license = licenses.gpl3; maintainers = with maintainers; [ akaWolf peterhoeg ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d4fab92a52..bc2451be96b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |