From 8c508de922366476e8c5c91b58765ff34b6c3e9b Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 28 Jun 2020 17:29:40 +0800
Subject: [PATCH] artiq: add binutils-arm dependency for 6.0+

---
 artiq-fast/default.nix    | 2 +-
 artiq-fast/pkgs/artiq.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index aa99e2f..0569314 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -32,7 +32,7 @@ let
     cargo-vendor = callPackage ./pkgs/rust/cargo-vendor.nix {};
     llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
     libartiq-support = callPackage ./pkgs/libartiq-support.nix { inherit rustc; };
-    artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k llvm-or1k llvmlite-artiq libartiq-support lit outputcheck; };
+    artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k binutils-arm llvm-or1k llvmlite-artiq libartiq-support lit outputcheck; };
     artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
     openocd = callPackage ./pkgs/openocd.nix {};
   };
diff --git a/artiq-fast/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix
index 1ae7a35..977e043 100644
--- a/artiq-fast/pkgs/artiq.nix
+++ b/artiq-fast/pkgs/artiq.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchgit, git, python3Packages, qt5Full, binutils-or1k, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck }:
+{ stdenv, lib, callPackage, fetchgit, git, python3Packages, qt5Full, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck }:
 
 let
   pythonDeps = callPackage ./python-deps.nix {};
@@ -9,6 +9,7 @@ in
     src = import ./artiq-src.nix { inherit fetchgit; };
     preBuild = "export VERSIONEER_OVERRIDE=${version}";
     propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
+      ++ (lib.lists.optionals (lib.strings.versionAtLeast version "6.0") [ binutils-arm ])
       ++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ])
       ++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]);
     checkInputs = [ binutils-or1k outputcheck ];