lol

xbursttools: Fix eval at least so tests pass

authored by

John Ericson and committed by
John Ericson
f55ccbb6 fc42ec0a

+7 -5
+3 -2
pkgs/tools/misc/xburst-tools/default.nix
··· 1 1 { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig 2 - , gccCross ? null }: 2 + , gccCross ? null, crossPrefix 3 + }: 3 4 4 5 let 5 6 version = "2011-12-26"; ··· 18 19 ''; 19 20 20 21 configureFlags = if gccCross != null then 21 - "--enable-firmware CROSS_COMPILE=${gccCross.crossConfig}-" 22 + "--enable-firmware CROSS_COMPILE=${crossPrefix}-" 22 23 else ""; 23 24 24 25 # Not to strip cross build binaries (this is for the gcc-cross-wrapper)
+4 -3
pkgs/top-level/all-packages.nix
··· 4816 4816 4817 4817 x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; 4818 4818 4819 - xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools { 4819 + xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec { 4820 4820 # It needs a cross compiler for mipsel to build the firmware it will 4821 4821 # load into the Ben Nanonote 4822 + crossPrefix = "mipsel-unknown-linux"; 4822 4823 gccCross = 4823 4824 let 4824 4825 pkgsCross = nixpkgsFun { 4825 4826 # Ben Nanonote system 4826 4827 crossSystem = { 4827 - config = "mipsel-unknown-linux"; 4828 + config = crossPrefix; 4828 4829 bigEndian = true; 4829 4830 arch = "mips"; 4830 4831 float = "soft"; ··· 4843 4844 }; 4844 4845 }; 4845 4846 in 4846 - pkgsCross.gccCrossStageStatic; 4847 + pkgsCross.buildPackages.gccCrossStageStatic; 4847 4848 }; 4848 4849 4849 4850 xclip = callPackage ../tools/misc/xclip { };