Skip to content

Commit

Permalink
Try fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tvorogme committed Dec 16, 2024
1 parent 7a4a7ab commit 176914f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 19 deletions.
5 changes: 1 addition & 4 deletions assembly/nix/linux-arm64-tonlib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{
pkgs ? import <nixpkgs> { inherit system; }
, lib ? pkgs.lib
, stdenv ? pkgs.stdenv
, system ? builtins.currentSystem
, src ? ./.
}:
Expand Down Expand Up @@ -46,12 +45,10 @@ pkgs.llvmPackages_16.stdenv.mkDerivation {
"-DMHD_FOUND=1"
"-DMHD_INCLUDE_DIR=${microhttpdmy}/usr/local/include"
"-DMHD_LIBRARY=${microhttpdmy}/usr/local/lib/libmicrohttpd.a"
"-DCMAKE_CXX_FLAGS=-w"
"-DCMAKE_C_FLAGS=-w"
"-DCMAKE_CXX_STANDARD=20"
"-DCMAKE_CXX_STANDARD_REQUIRED=ON"
"-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -Wno-unused-but-set-variable"
"-DCMAKE_C_COMPILER=clang"
"-DCMAKE_CXX_COMPILER=clang++"
];

LDFLAGS = [
Expand Down
2 changes: 1 addition & 1 deletion assembly/nix/linux-x86-64-tonlib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let
libc = glibc227;
bintools = pkgs.binutils.override { libc = glibc227; };
};
in (pkgs.overrideCC pkgs.stdenv cc);
in (pkgs.overrideCC pkgs.gcc12Stdenv cc);
staticLibs = import ./static-libs.nix { inherit pkgs; };
in
stdenv227.mkDerivation {
Expand Down
14 changes: 0 additions & 14 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,6 @@
(eachSystem (with system; [ x86_64-linux aarch64-linux ]) (system:
let
host = hostPkgs system;

nixos1909 = (import (builtins.fetchTarball {
url = "https://channels.nixos.org/nixos-19.09/nixexprs.tar.xz";
sha256 = "1vp1h2gkkrckp8dzkqnpcc6xx5lph5d2z46sg2cwzccpr8ay58zy";
}) { inherit system; });
glibc227 = nixos1909.glibc // { pname = "glibc"; };
stdenv227 = let
cc = host.wrapCCWith {
cc = nixos1909.buildPackages.gcc-unwrapped;
libc = glibc227;
bintools = host.binutils.override { libc = glibc227; };
};
in (host.overrideCC host.stdenv cc);

tonk = kind: ton {
inherit host;
inherit system;
Expand Down

0 comments on commit 176914f

Please sign in to comment.