Skip to content

Build dfx with glibc 2.27 #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nmattia wants to merge 1 commit into from
Closed

Build dfx with glibc 2.27 #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions dfx.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
, assets ? import ./assets.nix { inherit pkgs; }
}:
let
pkgs_glibc_2_27 = pkgs.pkgs_glibc_2_27;
lib = pkgs.lib;
workspace = pkgs.buildDfinityRustPackage {
workspace = pkgs_glibc_2_27.buildDfinityRustPackage {
name = "dfinity-sdk-rust";
srcDir = ./.;
regexes = [
Expand Down Expand Up @@ -54,15 +55,15 @@ let
# add a `standalone` target stripped of nix references
addStandalone = ws:
ws // {
standalone = pkgs.lib.standaloneRust
standalone = lib.standaloneRust
{
drv = ws.build;
exename = "dfx";
usePackager = false;
};
};

cc = pkgs.stdenv.cc;
cc = pkgs_glibc_2_27.stdenv.cc;

# fixup the shell for more convenient developer use
fixShell = ws:
Expand All @@ -82,7 +83,7 @@ let
inputsFrom = [ ws.shell ];
shellHook = ''
# Set CARGO_HOME to minimize interaction with any environment outside nix
export CARGO_HOME=${if pkgs.lib.isHydra then "." else toString ./.}/.cargo-home
export CARGO_HOME=${if lib.isHydra then "." else toString ./.}/.cargo-home

if [ ! -d "$CARGO_HOME" ]; then
mkdir -p $CARGO_HOME
Expand Down
14 changes: 12 additions & 2 deletions nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,27 @@ let
sha256 = "0a2rhxli7ss4wixppfwks0hy3zpazwm9l3y2v9krrnyiska3qfrw";
};

pkgs = import (commonSrc + "/pkgs") {
pkgs = mkPkgs [];

mkPkgs = e: import (commonSrc + "/pkgs") {
inherit system isMaster labels;
extraSources = sources;
repoRoot = ../.;
overlays = [
overlays = e ++ [
(
self: super:
let
nixFmt = self.lib.nixFmt {};
in
{
pkgs_glibc_2_27 = mkPkgs [
(
self: super: {

glibc = self.glibc_2_27;
}
)
];
motoko = import self.sources.motoko { inherit (self) system; };
dfinity = (import self.sources.dfinity { inherit (self) system; }).dfinity.rs;
napalm = self.callPackage self.sources.napalm {
Expand Down
4 changes: 2 additions & 2 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"common": {
"branch": "master",
"branch": "johnw/hans",
"repo": "ssh://git@github.com/dfinity-lab/common",
"rev": "52f0e0cdb97e371d9ada61249bccc875b51fec24",
"rev": "d8f7963cfb19f0b7149e787b875d0967cd9ecc80",
"type": "git"
},
"dfinity": {
Expand Down