diff --git a/artiq-fast/conda/build.nix b/artiq-fast/conda/build.nix index 9e3db36..506ed4c 100644 --- a/artiq-fast/conda/build.nix +++ b/artiq-fast/conda/build.nix @@ -15,7 +15,7 @@ assert (name != null) -> pname == null && version == null; let condaBuilderEnv = import ./builder-env.nix { inherit pkgs; }; realName = if (name != null) then name else "${pname}-${version}"; -in pkgs.stdenv.mkDerivation { +in pkgs.stdenvNoCC.mkDerivation { name = realName; inherit src; buildCommand = diff --git a/artiq-fast/conda/builder-env.nix b/artiq-fast/conda/builder-env.nix index e6748a1..8ef0d9c 100644 --- a/artiq-fast/conda/builder-env.nix +++ b/artiq-fast/conda/builder-env.nix @@ -3,7 +3,7 @@ with pkgs; 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, # so we don't have to manually deal with them. condaInstaller = fetchurl { @@ -47,6 +47,8 @@ in buildFHSUserEnv { name = "conda-builder-env"; targetPkgs = pkgs: ([ condaInstalled ] ++ condaDeps ++ [ + binutils + gcc # for llvm-or1k cmake ]