From 2c55f2ce4b2eeb6462534df6eaacbbde3f344740 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 16 Aug 2018 10:06:23 +0800
Subject: [PATCH] nix: install binutils-or1k

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

diff --git a/nix/artiq.nix b/nix/artiq.nix
index a21df0105..930389a4e 100644
--- a/nix/artiq.nix
+++ b/nix/artiq.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchsvn, python3Packages, qt5Full, llvm-or1k, llvmlite, python3}:
+{ stdenv, fetchFromGitHub, fetchsvn, python3Packages, qt5Full, binutils-or1k, llvm-or1k, llvmlite, python3}:
 
 let
 
@@ -98,7 +98,7 @@ python3Packages.buildPythonPackage rec {
   name = "artiq-${version}";
   src = ./..;
   buildInputs = with python3Packages; [ lit outputcheck ];
-  propagatedBuildInputs = with python3Packages; [ llvm-or1k llvmlite levenshtein pyqtgraph-qt5 aiohttp pygit2 pythonparser numpy dateutil quamash scipy prettytable pyserial asyncserial h5py cython regex qt5Full pyqt5 ];
+  propagatedBuildInputs = with python3Packages; [ binutils-or1k llvm-or1k llvmlite levenshtein pyqtgraph-qt5 aiohttp pygit2 pythonparser numpy dateutil quamash scipy prettytable pyserial asyncserial h5py cython regex qt5Full pyqt5 ];
   doCheck = false;
   meta = with stdenv.lib; {
     description = "";
diff --git a/nix/default.nix b/nix/default.nix
index 3561ff763..b536227ba 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -4,7 +4,7 @@ let
   callPackage = pkgs.lib.callPackageWith (pkgs // self );
 
 self = {
-  binutils-ork1 = callPackage ./binutils-or1k.nix {};
+  binutils-or1k = callPackage ./binutils-or1k.nix {};
   llvm-src = callPackage ./fetch-llvm-clang.nix {};
   llvm-or1k = callPackage ./llvm-or1k.nix {};
   llvmlite = callPackage ./llvmlite.nix {};