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

xbursttools: Cleanup slightly

Browse Source
This commit is contained in:
John Ericson 2018-05-09 22:40:27 -04:00 committed by John Ericson
parent e42a7a5c0b
commit f063a860d6
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/systems/examples.nix
View File

@ -57,6 +57,20 @@ rec {
platform = platforms.pogoplug4; platform = platforms.pogoplug4;
}; };
ben-nanonote = rec {
config = "mipsel-unknown-linux-uclibc";
arch = "mips";
float = "soft";
platform = {
name = "ben_nanonote";
kernelMajor = "2.6";
kernelArch = "mips";
gcc = {
arch = "mips32";
};
};
};
fuloongminipc = rec { fuloongminipc = rec {
config = "mipsel-unknown-linux-gnu"; config = "mipsel-unknown-linux-gnu";
arch = "mips"; arch = "mips";

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

@ -1,5 +1,5 @@
{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig
, gccCross ? null, crossPrefix , gccCross ? null
}: }:
let let
@ -19,7 +19,7 @@ stdenv.mkDerivation {
''; '';
configureFlags = if gccCross != null then configureFlags = if gccCross != null then
"--enable-firmware CROSS_COMPILE=${crossPrefix}-" "--enable-firmware CROSS_COMPILE=${gccCross.targetPrefix}"
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)

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

@ -5512,28 +5512,14 @@ 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 rec { xbursttools = callPackage ../tools/misc/xburst-tools {
# 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-gnu";
gccCross = gccCross =
let let
pkgsCross = nixpkgsFun { pkgsCross = nixpkgsFun {
# Ben Nanonote system # Ben Nanonote system
crossSystem = { crossSystem = lib.systems.examples.ben-nanonote;
config = crossPrefix;
arch = "mips";
float = "soft";
libc = "uclibc";
platform = {
name = "ben_nanonote";
kernelMajor = "2.6";
kernelArch = "mips";
};
gcc = {
arch = "mips32";
};
};
}; };
in in
pkgsCross.buildPackages.gccCrossStageStatic; pkgsCross.buildPackages.gccCrossStageStatic;