diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/libtoxcore | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libtoxcore')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libtoxcore/default.nix | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 63e0dae08a3f..87d6633f124e 100644 --- a/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/nixpkgs/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 ]; |