diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-24 10:41:33 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:53:52 -0400 |
| commit | f55ccbb60fb1022ce9d27595fc8200dd1d0da6db (patch) | |
| tree | e8d889fec2552b919910ed57ea91e179bd37e8bd /pkgs | |
| parent | fc42ec0a5cf9962a6af9c2da39ff748b30299b67 (diff) | |
| download | nixlib-f55ccbb60fb1022ce9d27595fc8200dd1d0da6db.tar nixlib-f55ccbb60fb1022ce9d27595fc8200dd1d0da6db.tar.gz nixlib-f55ccbb60fb1022ce9d27595fc8200dd1d0da6db.tar.bz2 nixlib-f55ccbb60fb1022ce9d27595fc8200dd1d0da6db.tar.lz nixlib-f55ccbb60fb1022ce9d27595fc8200dd1d0da6db.tar.xz nixlib-f55ccbb60fb1022ce9d27595fc8200dd1d0da6db.tar.zst nixlib-f55ccbb60fb1022ce9d27595fc8200dd1d0da6db.zip | |
xbursttools: Fix eval at least so tests pass
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/xburst-tools/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 408879a45345..c64ae609bcbb 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig -, gccCross ? null }: +, gccCross ? null, crossPrefix +}: let version = "2011-12-26"; @@ -18,7 +19,7 @@ stdenv.mkDerivation { ''; configureFlags = if gccCross != null then - "--enable-firmware CROSS_COMPILE=${gccCross.crossConfig}-" + "--enable-firmware CROSS_COMPILE=${crossPrefix}-" else ""; # Not to strip cross build binaries (this is for the gcc-cross-wrapper) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 882a308d2855..05fe28236b57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4816,15 +4816,16 @@ with pkgs; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; - xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools { + xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote + crossPrefix = "mipsel-unknown-linux"; gccCross = let pkgsCross = nixpkgsFun { # Ben Nanonote system crossSystem = { - config = "mipsel-unknown-linux"; + config = crossPrefix; bigEndian = true; arch = "mips"; float = "soft"; @@ -4843,7 +4844,7 @@ with pkgs; }; }; in - pkgsCross.gccCrossStageStatic; + pkgsCross.buildPackages.gccCrossStageStatic; }; xclip = callPackage ../tools/misc/xclip { }; |