Author: eelco
Date: Tue Dec 28 17:25:17 2010
New Revision: 25311
URL: https://svn.nixos.org/websvn/nix/?rev=25311&sc=1
Log:
* Fix an evaluation error in xburst-tools.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/xburst-tools/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/xburst-tools/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/xburst-tools/default.nix
Tue Dec 28 17:23:44 2010 (r25310)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/xburst-tools/default.nix
Tue Dec 28 17:25:17 2010 (r25311)
@@ -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";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Dec
28 17:23:44 2010 (r25310)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Dec
28 17:25:17 2010 (r25311)
@@ -1384,7 +1384,7 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
