public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbursttools: Fix eval at least so tests pass

Browse Source
This commit is contained in:
John Ericson 2017-04-24 10:41:33 -04:00 committed by John Ericson
parent fc42ec0a5c
commit f55ccbb60f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/xburst-tools/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig
, gccCross ? null }: , gccCross ? null, crossPrefix
}:
let let
version = "2011-12-26"; version = "2011-12-26";
@ -18,7 +19,7 @@ stdenv.mkDerivation {
''; '';
configureFlags = if gccCross != null then configureFlags = if gccCross != null then
"--enable-firmware CROSS_COMPILE=${gccCross.crossConfig}-" "--enable-firmware CROSS_COMPILE=${crossPrefix}-"
else ""; else "";
# Not to strip cross build binaries (this is for the gcc-cross-wrapper) # Not to strip cross build binaries (this is for the gcc-cross-wrapper)

7
pkgs/top-level/all-packages.nix
View File

@ -4816,15 +4816,16 @@ with pkgs;
x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; 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 # It needs a cross compiler for mipsel to build the firmware it will
# load into the Ben Nanonote # load into the Ben Nanonote
crossPrefix = "mipsel-unknown-linux";
gccCross = gccCross =
let let
pkgsCross = nixpkgsFun { pkgsCross = nixpkgsFun {
# Ben Nanonote system # Ben Nanonote system
crossSystem = { crossSystem = {
config = "mipsel-unknown-linux"; config = crossPrefix;
bigEndian = true; bigEndian = true;
arch = "mips"; arch = "mips";
float = "soft"; float = "soft";
@ -4843,7 +4844,7 @@ with pkgs;
}; };
}; };
in in
pkgsCross.gccCrossStageStatic; pkgsCross.buildPackages.gccCrossStageStatic;
}; };
xclip = callPackage ../tools/misc/xclip { }; xclip = callPackage ../tools/misc/xclip { };