From b342fdeb17713c710a4a56067c3c5e03b14091da Mon Sep 17 00:00:00 2001 From: Andrey Tvorozhkov Date: Wed, 12 Jun 2024 22:15:23 +0300 Subject: [PATCH] Fix bost --- assembly/nix/linux-arm64-static.nix | 4 ++-- assembly/nix/linux-arm64-tonlib.nix | 4 ++-- assembly/nix/linux-x86-64-static.nix | 4 ++-- assembly/nix/linux-x86-64-tonlib.nix | 4 ++-- assembly/nix/macos-static.nix | 4 ++-- assembly/nix/macos-tonlib.nix | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assembly/nix/linux-arm64-static.nix b/assembly/nix/linux-arm64-static.nix index 3cf1e2368..5848f15fa 100644 --- a/assembly/nix/linux-arm64-static.nix +++ b/assembly/nix/linux-arm64-static.nix @@ -9,8 +9,8 @@ let microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; }; staticLibs = import ./static-libs.nix { inherit pkgs; }; - staticBoost = staticLibs.staticBoost; - staticLibrdkafka = staticLibs.staticLibrdkafka; + staticBoost = pkgs.boost; + staticLibrdkafka = pkgs.rdkafka; in with import microhttpdmy; stdenv.mkDerivation { diff --git a/assembly/nix/linux-arm64-tonlib.nix b/assembly/nix/linux-arm64-tonlib.nix index 2b688a15a..0e7f4f4d1 100644 --- a/assembly/nix/linux-arm64-tonlib.nix +++ b/assembly/nix/linux-arm64-tonlib.nix @@ -9,8 +9,8 @@ let microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; }; staticLibs = import ./static-libs.nix { inherit pkgs; }; - staticBoost = staticLibs.staticBoost; - staticLibrdkafka = staticLibs.staticLibrdkafka; + staticBoost = pkgs.boost; + staticLibrdkafka = pkgs.rdkafka; in with import microhttpdmy; pkgs.llvmPackages_16.stdenv.mkDerivation { diff --git a/assembly/nix/linux-x86-64-static.nix b/assembly/nix/linux-x86-64-static.nix index dbac5764e..016a5260c 100644 --- a/assembly/nix/linux-x86-64-static.nix +++ b/assembly/nix/linux-x86-64-static.nix @@ -9,8 +9,8 @@ let microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; }; staticLibs = import ./static-libs.nix { inherit pkgs; }; - staticBoost = staticLibs.staticBoost; - staticLibrdkafka = staticLibs.staticLibrdkafka; + staticBoost = pkgs.boost; + staticLibrdkafka = pkgs.rdkafka; in with import microhttpdmy; stdenv.mkDerivation { diff --git a/assembly/nix/linux-x86-64-tonlib.nix b/assembly/nix/linux-x86-64-tonlib.nix index 677a3e58d..d78d7ad0a 100644 --- a/assembly/nix/linux-x86-64-tonlib.nix +++ b/assembly/nix/linux-x86-64-tonlib.nix @@ -22,8 +22,8 @@ let }; in (pkgs.overrideCC pkgs.stdenv cc); staticLibs = import ./static-libs.nix { inherit pkgs; }; - staticBoost = staticLibs.staticBoost; - staticLibrdkafka = staticLibs.staticLibrdkafka; + staticBoost = pkgs.boost; + staticLibrdkafka = pkgs.rdkafka; in stdenv227.mkDerivation { pname = "ton"; diff --git a/assembly/nix/macos-static.nix b/assembly/nix/macos-static.nix index c8e451de6..35cd134a1 100644 --- a/assembly/nix/macos-static.nix +++ b/assembly/nix/macos-static.nix @@ -8,8 +8,8 @@ }: let staticLibs = import ./static-libs.nix { inherit pkgs; }; - staticBoost = staticLibs.staticBoost; - staticLibrdkafka = staticLibs.staticLibrdkafka; + staticBoost = pkgs.boost; + staticLibrdkafka = pkgs.rdkafka; in pkgs.llvmPackages_14.stdenv.mkDerivation { pname = "ton"; diff --git a/assembly/nix/macos-tonlib.nix b/assembly/nix/macos-tonlib.nix index a720afbfa..f846474b7 100644 --- a/assembly/nix/macos-tonlib.nix +++ b/assembly/nix/macos-tonlib.nix @@ -9,8 +9,8 @@ let # Import custom static packages staticLibs = import ./static-libs.nix { inherit pkgs; }; - staticBoost = staticLibs.staticBoost; - staticLibrdkafka = staticLibs.staticLibrdkafka; + staticBoost = pkgs.boost; + staticLibrdkafka = pkgs.rdkafka; in pkgs.llvmPackages_14.stdenv.mkDerivation { pname = "ton";