M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

conda: fix ld-linux location. Closes #72

This commit is contained in:
Sebastien Bourdeauducq 2021-11-05 11:33:13 +08:00
parent 8cb6a0bfd8
commit 1bcfecb9d7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artiq-fast/conda/builder-env.nix
View File

@ -43,12 +43,15 @@ let
ln -s ${libiconv} ${libiconv-filename} ln -s ${libiconv} ${libiconv-filename}
${condaInstallerEnv}/bin/conda-installer-env -c "$out/bin/conda install ${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 in
buildFHSUserEnv { buildFHSUserEnv {
name = "conda-builder-env"; name = "conda-builder-env";
targetPkgs = pkgs: ([ condaInstalled ] ++ condaDeps ++ [ targetPkgs = pkgs: ([ condaInstalled ] ++ condaDeps ++ [
binutils binutils-fhs
gcc gcc-fhs
# for llvm-or1k # for llvm-or1k
cmake cmake
] ]