Fix boost

disintar · Jun 11, 2024 · b18c83e · b18c83e
1 parent 9e557c4
commit b18c83e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 6 deletions.
diff --git a/assembly/nix/linux-arm64-static.nix b/assembly/nix/linux-arm64-static.nix
@@ -8,6 +8,7 @@
 }:
 let
   microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; };
+  staticBoost = import ./static-boost.nix { inherit pkgs; };
 in
 with import microhttpdmy;
 stdenv.mkDerivation {
@@ -23,7 +24,7 @@ stdenv.mkDerivation {
 
   buildInputs = with pkgs;
     [
-      pkgsStatic.openssl microhttpdmy pkgsStatic.zlib pkgsStatic.libsodium.dev pkgsStatic.secp256k1 glibc.static boost
+      pkgsStatic.openssl microhttpdmy pkgsStatic.zlib pkgsStatic.libsodium.dev pkgsStatic.secp256k1 glibc.static staticBoost
     ];
 
   makeStatic = true;

diff --git a/assembly/nix/linux-arm64-tonlib.nix b/assembly/nix/linux-arm64-tonlib.nix
@@ -7,7 +7,8 @@
 , src ? ./.
 }:
 let
-     microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; };
+  microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; };
+  staticBoost = import ./static-boost.nix { inherit pkgs; };
 in
 with import microhttpdmy;
 pkgs.llvmPackages_16.stdenv.mkDerivation {
@@ -23,7 +24,7 @@ pkgs.llvmPackages_16.stdenv.mkDerivation {
 
   buildInputs = with pkgs;
     [
-      pkgsStatic.openssl microhttpdmy pkgsStatic.zlib pkgsStatic.secp256k1 boost
+      pkgsStatic.openssl microhttpdmy pkgsStatic.zlib pkgsStatic.secp256k1 staticBoost
       (pkgsStatic.libsodium.overrideAttrs (oldAttrs: {
         # https://github.com/jedisct1/libsodium/issues/292#issuecomment-137135369
         configureFlags = oldAttrs.configureFlags ++ [ " --disable-pie" ];

diff --git a/assembly/nix/linux-x86-64-static.nix b/assembly/nix/linux-x86-64-static.nix
@@ -8,6 +8,7 @@
 }:
 let
   microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; };
+  staticBoost = import ./static-boost.nix { inherit pkgs; };
 in
 with import microhttpdmy;
 stdenv.mkDerivation {
@@ -23,7 +24,7 @@ stdenv.mkDerivation {
 
   buildInputs = with pkgs;
     [
-      pkgsStatic.openssl microhttpdmy pkgsStatic.zlib pkgsStatic.libsodium.dev pkgsStatic.secp256k1 glibc.static boost
+      pkgsStatic.openssl microhttpdmy pkgsStatic.zlib pkgsStatic.libsodium.dev pkgsStatic.secp256k1 glibc.static staticBoost
     ];
 
   makeStatic = true;

diff --git a/assembly/nix/linux-x86-64-tonlib.nix b/assembly/nix/linux-x86-64-tonlib.nix
@@ -21,6 +21,7 @@ let
               bintools = pkgs.binutils.override { libc = glibc227; };
             };
           in (pkgs.overrideCC pkgs.stdenv cc);
+          staticBoost = import ./static-boost.nix { inherit pkgs; };
 
 in
 stdenv227.mkDerivation {

diff --git a/assembly/nix/macos-static.nix b/assembly/nix/macos-static.nix
@@ -6,6 +6,9 @@
 , system ? builtins.currentSystem
 , src ? ./.
 }:
+let
+  staticBoost = import ./static-boost.nix { inherit pkgs; };
+in
 pkgs.llvmPackages_14.stdenv.mkDerivation {
   pname = "ton";
   version = "dev-bin";
@@ -17,7 +20,7 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
 
   buildInputs = with pkgs;
    lib.forEach [
-        secp256k1 libsodium.dev libmicrohttpd.dev gmp.dev nettle.dev libtasn1.dev libidn2.dev libunistring.dev gettext (gnutls.override { withP11-kit = false; }).dev boost
+        secp256k1 libsodium.dev libmicrohttpd.dev gmp.dev nettle.dev libtasn1.dev libidn2.dev libunistring.dev gettext (gnutls.override { withP11-kit = false; }).dev staticBoost
       ]
       (x: x.overrideAttrs(oldAttrs: rec { configureFlags = (oldAttrs.configureFlags or []) ++ [ "--enable-static" "--disable-shared" "--disable-tests" ]; dontDisableStatic = true; }))
     ++ [

diff --git a/assembly/nix/macos-tonlib.nix b/assembly/nix/macos-tonlib.nix
@@ -6,6 +6,9 @@
 , system ? builtins.currentSystem
 , src ? ./.
 }:
+let
+  staticBoost = import ./static-boost.nix { inherit pkgs; };
+in
 pkgs.llvmPackages_14.stdenv.mkDerivation {
   pname = "ton";
   version = "dev-lib";
@@ -17,7 +20,7 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
 
   buildInputs = with pkgs;
     lib.forEach [
-      secp256k1 libsodium.dev libmicrohttpd.dev gmp.dev nettle.dev libtasn1.dev libidn2.dev libunistring.dev gettext (gnutls.override { withP11-kit = false; }).dev boost
+      secp256k1 libsodium.dev libmicrohttpd.dev gmp.dev nettle.dev libtasn1.dev libidn2.dev libunistring.dev gettext (gnutls.override { withP11-kit = false; }).dev staticBoost
     ] (x: x.overrideAttrs(oldAttrs: rec { configureFlags = (oldAttrs.configureFlags or []) ++ [ "--enable-static" "--disable-shared" "--disable-tests" ]; dontDisableStatic = true; }))
     ++ [
       darwin.apple_sdk.frameworks.CoreFoundation

diff --git a/assembly/nix/static-boost.nix b/assembly/nix/static-boost.nix
@@ -0,0 +1,9 @@
+{ pkgs }:
+
+pkgs.boost.overrideAttrs (oldAttrs: {
+  buildInputs = (oldAttrs.buildInputs or []) ++ [ pkgs.stdenv ];
+  doCheck = false;
+  postConfigure = ''
+    ./b2 install --prefix=$out --build-dir=build --layout=system link=static threading=multi runtime-link=static
+  '';
+})