From 5bb40967636c22f45b03dbbda9cc3b896ee76b27 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 28 Dec 2010 17:25:17 +0000 Subject: [PATCH] * Fix an evaluation error in xburst-tools. svn path=/nixpkgs/branches/stdenv-updates/; revision=25311 --- pkgs/tools/misc/xburst-tools/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 2408a1cd35c0..685307bb0227 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchgit, libusb, autoconf, automake, confuse -, gccCross ? null}: +{ stdenv, fetchgit, libusb, autoconf, automake, confuse +, gccCross ? null }: let version = "2010-07-29"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc99a6a1411d..c8588aa435f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1384,7 +1384,7 @@ let x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; - xbursttools = import ../tools/misc/xburst-tools { + xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools { inherit stdenv fetchgit autoconf automake libusb confuse; # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote