From cbc8eee7acebe2a71fc7981fba292bc89b0147d0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 May 2007 13:32:18 +0000 Subject: [PATCH] * stdenv: new attribute is64bit. * stdenv: for convience, provide the library functions in pkgs/lib/default.nix through the lib attribute. svn path=/nixpkgs/trunk/; revision=8740 --- pkgs/stdenv/generic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 85d30808fcd..48cff5825cb 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -60,12 +60,17 @@ let { isi686 = result.system == "i686-linux" || result.system == "i686-darwin" || result.system == "i686-freebsd"; + is64bit = result.system == "x86_64-linux"; # Utility function: allow stdenv to be easily regenerated with # a different setup script. (See all-packages.nix for an # example.) regenerate = stdenvGenerator; + # For convenience, bring in the library functions in lib/ so + # packages don't have to do that themselves. + lib = import ../../lib; + } # Propagate any extra attributes. For instance, we use this to