From 4a07c98faa556b0bebffd83a04d0ff537c20cdec Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Mon, 7 Dec 2020 16:08:00 +0300 Subject: [PATCH] Build dynamic binaries via nix Problem: Rust doesn't work well with musl, see https://github.com/NixOS/nixpkgs/issues/71195. Solution: Provide dynamically linked binaries instead. This should be fine since we don't use them in the releases and they're mostly used in our internal infrastructure. --- nix/README.md | 2 +- nix/default.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nix/README.md b/nix/README.md index 6e31b30d1..5f5634a7a 100644 --- a/nix/README.md +++ b/nix/README.md @@ -6,7 +6,7 @@ # Building and packaging tezos using nix -## Statically built binaries +## Dynamically built binaries In order to build all binaries run: ```bash diff --git a/nix/default.nix b/nix/default.nix index 82deaf47e..f6bc9b112 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -7,12 +7,11 @@ let pkgs = import ./build/pkgs.nix { }; source = (import ./nix/sources.nix).tezos; protocols = import ./protocols.nix; - bin = pkgs.callPackage ./build/bin.nix { }; release-binaries = builtins.filter (elem: elem.name != "tezos-sandbox") (import ./build/release-binaries.nix); binaries = builtins.listToAttrs (map (meta: { inherit (meta) name; - value = bin pkgs.pkgsMusl.ocamlPackages.${meta.name} // { inherit meta; }; + value = pkgs.ocamlPackages.${meta.name} // { inherit meta; }; }) release-binaries); # Bundle the contents of a package set together, leaving the original attrs intact