From f82827e79e69180bcbb0dd6f9a120105fd7c2af1 Mon Sep 17 00:00:00 2001 From: neodix42 Date: Tue, 22 Oct 2024 12:55:05 +0400 Subject: [PATCH] Fix failing tonlib compilation on ubuntu with nixpkgs (#1309) * force gcc-11+ * install gcc-11+ * fix missing gcc-11 in nix build on ubuntu * cleanup --- assembly/native/build-macos-portable.sh | 2 +- assembly/nix/linux-arm64-tonlib.nix | 5 ++++- assembly/nix/linux-x86-64-tonlib.nix | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/assembly/native/build-macos-portable.sh b/assembly/native/build-macos-portable.sh index fa4702abd..0e1003b56 100644 --- a/assembly/native/build-macos-portable.sh +++ b/assembly/native/build-macos-portable.sh @@ -24,7 +24,7 @@ else fi export NONINTERACTIVE=1 -brew install ninja pkg-config automake libtool autoconf +brew install ninja pkg-config automake libtool autoconf texinfo brew install llvm@16 diff --git a/assembly/nix/linux-arm64-tonlib.nix b/assembly/nix/linux-arm64-tonlib.nix index a051e34cd..9d251e020 100644 --- a/assembly/nix/linux-arm64-tonlib.nix +++ b/assembly/nix/linux-arm64-tonlib.nix @@ -42,10 +42,13 @@ pkgs.llvmPackages_16.stdenv.mkDerivation { ]; dontAddStaticConfigureFlags = false; + doCheck = false; + doInstallCheck = false; cmakeFlags = [ - "-DTON_USE_ABSEIL=OFF" + "-DTON_USE_ABSEIL=ON" "-DNIX=ON" + "-DTON_ONLY_TONLIB=ON" ]; LDFLAGS = [ diff --git a/assembly/nix/linux-x86-64-tonlib.nix b/assembly/nix/linux-x86-64-tonlib.nix index f961eea21..64ceaaea2 100644 --- a/assembly/nix/linux-x86-64-tonlib.nix +++ b/assembly/nix/linux-x86-64-tonlib.nix @@ -58,10 +58,13 @@ stdenv227.mkDerivation { ]; dontAddStaticConfigureFlags = false; + doCheck = false; + doInstallCheck = false; cmakeFlags = [ "-DTON_USE_ABSEIL=ON" "-DNIX=ON" + "-DTON_ONLY_TONLIB=ON" ]; LDFLAGS = [