diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-09 22:40:27 -0400 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2018-05-09 23:40:13 -0400 |
| commit | f063a860d69c5fbf3695a262da6a551ddd92a5f2 (patch) | |
| tree | 1a4b409180969195905924d495b91bf1f42c2e9c | |
| parent | e42a7a5c0bdeb4c40921d319ae6a14f7e304e4df (diff) | |
| download | nixlib-f063a860d69c5fbf3695a262da6a551ddd92a5f2.tar nixlib-f063a860d69c5fbf3695a262da6a551ddd92a5f2.tar.gz nixlib-f063a860d69c5fbf3695a262da6a551ddd92a5f2.tar.bz2 nixlib-f063a860d69c5fbf3695a262da6a551ddd92a5f2.tar.lz nixlib-f063a860d69c5fbf3695a262da6a551ddd92a5f2.tar.xz nixlib-f063a860d69c5fbf3695a262da6a551ddd92a5f2.tar.zst nixlib-f063a860d69c5fbf3695a262da6a551ddd92a5f2.zip | |
xbursttools: Cleanup slightly
| -rw-r--r-- | lib/systems/examples.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/xburst-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
3 files changed, 18 insertions, 18 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 848737700b0b..f3abfe2c621f 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -57,6 +57,20 @@ rec { 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 { config = "mipsel-unknown-linux-gnu"; arch = "mips"; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index c64ae609bcbb..21aabc4e89cc 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig -, gccCross ? null, crossPrefix +, gccCross ? null }: let @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; configureFlags = if gccCross != null then - "--enable-firmware CROSS_COMPILE=${crossPrefix}-" + "--enable-firmware CROSS_COMPILE=${gccCross.targetPrefix}" 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 d38f8d201889..627bac20e938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5512,28 +5512,14 @@ with pkgs; 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 # load into the Ben Nanonote - crossPrefix = "mipsel-unknown-linux-gnu"; gccCross = let pkgsCross = nixpkgsFun { # Ben Nanonote system - crossSystem = { - config = crossPrefix; - arch = "mips"; - float = "soft"; - libc = "uclibc"; - platform = { - name = "ben_nanonote"; - kernelMajor = "2.6"; - kernelArch = "mips"; - }; - gcc = { - arch = "mips32"; - }; - }; + crossSystem = lib.systems.examples.ben-nanonote; }; in pkgsCross.buildPackages.gccCrossStageStatic; |