From 1bcfecb9d71d8fc2440e42705beed43d4dc2867c Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 5 Nov 2021 11:33:13 +0800 Subject: [PATCH] conda: fix ld-linux location. Closes #72 --- artiq-fast/conda/builder-env.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/artiq-fast/conda/builder-env.nix b/artiq-fast/conda/builder-env.nix index 8ef0d9c..b5bbbbc 100644 --- a/artiq-fast/conda/builder-env.nix +++ b/artiq-fast/conda/builder-env.nix @@ -43,12 +43,15 @@ let ln -s ${libiconv} ${libiconv-filename} ${condaInstallerEnv}/bin/conda-installer-env -c "$out/bin/conda install ${libiconv-filename}" ''; + + binutils-fhs = (pkgs.binutils.overrideAttrs(oa: {postFixup = oa.postFixup + "echo /lib64/ld-linux-x86-64.so.2 > $out/nix-support/dynamic-linker";})); + gcc-fhs = (pkgs.gcc.override {bintools = binutils-fhs;} ); in buildFHSUserEnv { name = "conda-builder-env"; targetPkgs = pkgs: ([ condaInstalled ] ++ condaDeps ++ [ - binutils - gcc + binutils-fhs + gcc-fhs # for llvm-or1k cmake ]