From 8cb6a0bfd8c4b0b4df18f7a4b6f1d171719e9a95 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 5 Nov 2021 10:29:15 +0800
Subject: [PATCH] clean up conda build environment

---
 artiq-fast/conda/build.nix       | 2 +-
 artiq-fast/conda/builder-env.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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
       ]