From c706b6e0f4c02e910cb1a451d7de42519182f977 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 13 Sep 2021 07:48:28 +0800 Subject: [PATCH] conda: add lld dependency for ARTIQ-7 --- artiq-fast/conda/artiq.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/artiq-fast/conda/artiq.nix b/artiq-fast/conda/artiq.nix index 6b25f96..c85fc4e 100644 --- a/artiq-fast/conda/artiq.nix +++ b/artiq-fast/conda/artiq.nix @@ -7,8 +7,6 @@ let inherit version; src = import ../pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; }; dependencies = [ - (if (pkgs.lib.strings.versionAtLeast version "7.0") then "llvmlite" else "llvmlite-artiq") - (if (pkgs.lib.strings.versionAtLeast version "7.0") then "llvm-tools" else "binutils-or1k-linux") "pythonparser" "scipy" "numpy" @@ -21,7 +19,7 @@ let "pygit2" "python-levenshtein" "sipyco" - ]; + ] ++ (if (pkgs.lib.strings.versionAtLeast version "7.0") then ["llvmlite" "llvm-tools" "lld"] else ["llvmlite-artiq" "binutils-or1k-linux"]); extraYaml = '' about: