conda: fix ld-linux location. Closes #72

2021-11-05 11:33:13 +08:00 · 2021-11-05 11:33:13 +08:00 · 1bcfecb9d7
commit 1bcfecb9d7
parent 8cb6a0bfd8
1 changed files with 5 additions and 2 deletions
--- 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
      ]