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

clean up conda build environment

This commit is contained in:
Sebastien Bourdeauducq 2021-11-05 10:29:15 +08:00
parent 643ce70b4c
commit 8cb6a0bfd8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-fast/conda/build.nix
View File

@ -15,7 +15,7 @@ assert (name != null) -> pname == null && version == null;
let let
condaBuilderEnv = import ./builder-env.nix { inherit pkgs; }; condaBuilderEnv = import ./builder-env.nix { inherit pkgs; };
realName = if (name != null) then name else "${pname}-${version}"; realName = if (name != null) then name else "${pname}-${version}";
in pkgs.stdenv.mkDerivation { in pkgs.stdenvNoCC.mkDerivation {
name = realName; name = realName;
inherit src; inherit src;
buildCommand = buildCommand =

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

@ -3,7 +3,7 @@
with pkgs; with pkgs;
let let
condaDeps = [ stdenv.cc zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ]; condaDeps = [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ];
# Use the full Anaconda distribution, which already contains conda-build and its many dependencies, # Use the full Anaconda distribution, which already contains conda-build and its many dependencies,
# so we don't have to manually deal with them. # so we don't have to manually deal with them.
condaInstaller = fetchurl { condaInstaller = fetchurl {
@ -47,6 +47,8 @@ in
buildFHSUserEnv { buildFHSUserEnv {
name = "conda-builder-env"; name = "conda-builder-env";
targetPkgs = pkgs: ([ condaInstalled ] ++ condaDeps ++ [ targetPkgs = pkgs: ([ condaInstalled ] ++ condaDeps ++ [
binutils
gcc
# for llvm-or1k # for llvm-or1k
cmake cmake
] ]