Fix boost

disintar · Jun 11, 2024 · 80f9839 · 80f9839
1 parent 3233261
commit 80f9839
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 2 deletions.
diff --git a/assembly/nix/linux-arm64-static.nix b/assembly/nix/linux-arm64-static.nix
@@ -9,6 +9,13 @@
 let
   microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; };
 in
+let
+  # Define pkgsStatic with a custom overlay
+  pkgsStatic = import <nixpkgs> {
+    inherit system;
+    overlays = [ (import ./static-overlay.nix) ];
+  };
+in
 with import microhttpdmy;
 stdenv.mkDerivation {
   pname = "ton";

diff --git a/assembly/nix/linux-arm64-tonlib.nix b/assembly/nix/linux-arm64-tonlib.nix
@@ -9,6 +9,13 @@
 let
   microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; };
 in
+let
+  # Define pkgsStatic with a custom overlay
+  pkgsStatic = import <nixpkgs> {
+    inherit system;
+    overlays = [ (import ./static-overlay.nix) ];
+  };
+in
 with import microhttpdmy;
 pkgs.llvmPackages_16.stdenv.mkDerivation {
   pname = "ton";

diff --git a/assembly/nix/linux-x86-64-static.nix b/assembly/nix/linux-x86-64-static.nix
@@ -9,6 +9,13 @@
 let
   microhttpdmy = (import ./microhttpd.nix) { inherit pkgs; };
 in
+let
+  # Define pkgsStatic with a custom overlay
+  pkgsStatic = import <nixpkgs> {
+    inherit system;
+    overlays = [ (import ./static-overlay.nix) ];
+  };
+in
 with import microhttpdmy;
 stdenv.mkDerivation {
   pname = "ton";

diff --git a/assembly/nix/linux-x86-64-tonlib.nix b/assembly/nix/linux-x86-64-tonlib.nix
@@ -23,6 +23,13 @@ let
           in (pkgs.overrideCC pkgs.stdenv cc);
 
 in
+let
+  # Define pkgsStatic with a custom overlay
+  pkgsStatic = import <nixpkgs> {
+    inherit system;
+    overlays = [ (import ./static-overlay.nix) ];
+  };
+in
 stdenv227.mkDerivation {
   pname = "ton";
   version = "dev-lib";

diff --git a/assembly/nix/macos-static.nix b/assembly/nix/macos-static.nix
@@ -7,9 +7,10 @@
 , src ? ./.
 }:
 let
+  # Define pkgsStatic with a custom overlay
   pkgsStatic = import <nixpkgs> {
     inherit system;
-    overlays = [ (self: super: { inherit (pkgs) stdenv; }) ];
+    overlays = [ (import ./static-overlay.nix) ];
   };
 in
 pkgs.llvmPackages_14.stdenv.mkDerivation {
@@ -35,6 +36,7 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
       pkgsStatic.librdkafka
    ];
 
+
   dontAddStaticConfigureFlags = true;
   makeStatic = true;
   doCheck = true;
@@ -77,7 +79,7 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
           install_name_tool -change "$(otool -L "$fn" | grep libc++.1 | cut -d' ' -f1 | xargs)" libc++.1.dylib "$fn"
           install_name_tool -change "$(otool -L "$fn" | grep libc++abi.1 | cut -d' ' -f1 | xargs)" libc++abi.dylib "$fn"
         done
-      fi
+        fi
   '';
   outputs = [ "bin" "out" ];
 }
diff --git a/assembly/nix/static-overlay.nix b/assembly/nix/static-overlay.nix
@@ -0,0 +1,15 @@
+self: super: {
+  boost = super.boost.overrideAttrs (oldAttrs: {
+    buildInputs = (oldAttrs.buildInputs or []) ++ [ super.stdenv ];
+    doCheck = false;
+    configurePhase = '' ''; # No configure phase
+    buildPhase = ''
+      ./bootstrap.sh --prefix=$out --with-toolset=clang
+      ./b2 install --prefix=$out --build-dir=build --layout=system link=static threading=multi runtime-link=static
+    '';
+  });
+
+  librdkafka = super.librdkafka.overrideAttrs (oldAttrs: {
+    configureFlags = (oldAttrs.configureFlags or []) ++ [ "--enable-static", "--disable-shared" ];
+  });
+}