forked from M-Labs/nix-scripts
artiq: add binutils-arm dependency for 6.0+
This commit is contained in:
parent
48bc991c7c
commit
8c508de922
|
@ -32,7 +32,7 @@ let
|
||||||
cargo-vendor = callPackage ./pkgs/rust/cargo-vendor.nix {};
|
cargo-vendor = callPackage ./pkgs/rust/cargo-vendor.nix {};
|
||||||
llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
|
llvmlite-artiq = callPackage ./pkgs/llvmlite-artiq.nix { inherit llvm-or1k; };
|
||||||
libartiq-support = callPackage ./pkgs/libartiq-support.nix { inherit rustc; };
|
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}"; });
|
artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
|
||||||
openocd = callPackage ./pkgs/openocd.nix {};
|
openocd = callPackage ./pkgs/openocd.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
|
let
|
||||||
pythonDeps = callPackage ./python-deps.nix {};
|
pythonDeps = callPackage ./python-deps.nix {};
|
||||||
|
@ -9,6 +9,7 @@ in
|
||||||
src = import ./artiq-src.nix { inherit fetchgit; };
|
src = import ./artiq-src.nix { inherit fetchgit; };
|
||||||
preBuild = "export VERSIONEER_OVERRIDE=${version}";
|
preBuild = "export VERSIONEER_OVERRIDE=${version}";
|
||||||
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
|
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 pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ])
|
||||||
++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]);
|
++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]);
|
||||||
checkInputs = [ binutils-or1k outputcheck ];
|
checkInputs = [ binutils-or1k outputcheck ];
|
||||||
|
|
Loading…
Reference in New Issue