srenblad/artiq
1
0
Fork 0
forked from M-Labs/artiq
Code Pull Requests Activity

nix: install binutils-or1k

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2018-08-16 10:06:23 +08:00
parent 2e6c0b6a6d
commit 2c55f2ce4b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/artiq.nix
View File

@ -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 let
@ -98,7 +98,7 @@ python3Packages.buildPythonPackage rec {
name = "artiq-${version}"; name = "artiq-${version}";
src = ./..; src = ./..;
buildInputs = with python3Packages; [ lit outputcheck ]; 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; doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = ""; description = "";

2
nix/default.nix
View File

@ -4,7 +4,7 @@ let
callPackage = pkgs.lib.callPackageWith (pkgs // self ); callPackage = pkgs.lib.callPackageWith (pkgs // self );
self = { self = {
binutils-ork1 = callPackage ./binutils-or1k.nix {}; binutils-or1k = callPackage ./binutils-or1k.nix {};
llvm-src = callPackage ./fetch-llvm-clang.nix {}; llvm-src = callPackage ./fetch-llvm-clang.nix {};
llvm-or1k = callPackage ./llvm-or1k.nix {}; llvm-or1k = callPackage ./llvm-or1k.nix {};
llvmlite = callPackage ./llvmlite.nix {}; llvmlite = callPackage ./llvmlite.nix {};