From 9589a3cda769694f1a0a8b21ec1d96482eaad37a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 25 Jun 2023 23:22:34 +0800 Subject: [PATCH] libtoxcore: drop unnecessary dependency on msgpack --- .../libraries/libtoxcore/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 63e0dae08a3..87d6633f124 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, cmake, libsodium, ncurses, libopus, msgpack -, libvpx, check, libconfig, pkg-config }: +{ lib +, stdenv +, fetchurl +, cmake +, libsodium +, ncurses +, libopus +, libvpx +, check +, libconfig +, pkg-config +}: let buildToxAV = !stdenv.isAarch32; in stdenv.mkDerivation rec { @@ -14,14 +24,18 @@ in stdenv.mkDerivation rec { sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI="; }; - cmakeFlags = - [ "-DBUILD_NTOX=ON" "-DDHT_BOOTSTRAP=ON" "-DBOOTSTRAP_DAEMON=ON" ] - ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON"; + cmakeFlags = [ + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ] ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON"; buildInputs = [ - libsodium msgpack ncurses libconfig + libsodium + ncurses + libconfig ] ++ lib.optionals buildToxAV [ - libopus libvpx + libopus + libvpx ]; nativeBuildInputs = [ cmake pkg-config ];