diff options
| author | Danny Wilson <danny@prime.vc> | 2013-02-20 09:18:26 +0000 |
|---|---|---|
| committer | Danny Wilson <danny@onlinetouch.nl> | 2013-02-28 20:04:01 +0100 |
| commit | cf42601f92c400b81c0db4b0c932075290811cc7 (patch) | |
| tree | 18bbb470783a28cf3a93e11a70642f710be82699 /pkgs/stdenv | |
| parent | d505b8c49032118f7d11d669d2641c2c81a78bcb (diff) | |
| download | nixpkgs-cf42601f92c400b81c0db4b0c932075290811cc7.tar nixpkgs-cf42601f92c400b81c0db4b0c932075290811cc7.tar.gz nixpkgs-cf42601f92c400b81c0db4b0c932075290811cc7.tar.bz2 nixpkgs-cf42601f92c400b81c0db4b0c932075290811cc7.tar.lz nixpkgs-cf42601f92c400b81c0db4b0c932075290811cc7.tar.xz nixpkgs-cf42601f92c400b81c0db4b0c932075290811cc7.tar.zst nixpkgs-cf42601f92c400b81c0db4b0c932075290811cc7.zip | |
Coreutils update and Illumos compatibility fixes.
- GNU Coreutils 8.21 - Add is64Bit checks to stdenv for Solaris. - Fix OpenSSL Illumos build.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 6f5e5d34582..843bf580b6a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -114,11 +114,13 @@ let isx86_64 = result.system == "x86_64-linux" || result.system == "x86_64-darwin" || result.system == "x86_64-freebsd" - || result.system == "x86_64-openbsd"; + || result.system == "x86_64-openbsd" + || result.system == "x86_64-solaris"; is64bit = result.system == "x86_64-linux" || result.system == "x86_64-darwin" || result.system == "x86_64-freebsd" - || result.system == "x86_64-openbsd"; + || result.system == "x86_64-openbsd" + || result.system == "x86_64-solaris"; isMips = result.system == "mips-linux" || result.system == "mips64el-linux"; isArm = result.system == "armv5tel-linux" |