From 5abed12234b39120cb0e509114838fb56d7ff41f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2011 14:11:04 +0000 Subject: [PATCH] * i386-sunos -> i686-solaris. svn path=/nixpkgs/trunk/; revision=30507 --- pkgs/development/libraries/ncurses/default.nix | 2 +- pkgs/development/tools/misc/autoconf/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 3 ++- pkgs/stdenv/native/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 6e15dca01f3..b503493ac88 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -8,7 +8,7 @@ let , but this is left as an exercise to the reader. So disable them for now. */ - cxx = stdenv.system != "i386-sunos"; + cxx = stdenv.system != "i686-solaris"; in stdenv.mkDerivation (rec { name = "ncurses-5.7"; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 82f8b110054..ce18fd1a377 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # details. # There are many test failures on `i386-pc-solaris2.11'. doCheck = (stdenv.system != "i686-cygwin" - && stdenv.system != "i386-sunos"); + && stdenv.system != "i686-solaris"); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c4d6a3666d0..436b912d8d6 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -98,7 +98,8 @@ let || result.system == "powerpc-linux" || result.system == "armv5tel-linux" || result.system == "mips64-linux"; - isSunOS = result.system == "i386-sunos"; + isSunOS = result.system == "i686-solaris" + || result.system == "x86_64-solaris"; isCygwin = result.system == "i686-cygwin"; isFreeBSD = result.system == "i686-freebsd" || result.system == "x86_64-freebsd"; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 88b3c17b582..9d3b60d67a5 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -3,12 +3,12 @@ rec { shell = - if system == "i686-freebsd" || system == "x86_64-freebsd" - then "/usr/local/bin/bash" + if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" + else if system == "i686-solaris" then "/usr/bin/bash" else "/bin/bash"; path = - (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++ + (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++ (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ ["/" "/usr" "/usr/local"]; @@ -115,7 +115,7 @@ rec { name = "gcc-native"; nativeTools = true; nativeLibc = true; - nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr"; + nativePrefix = if system == "i686-solaris" then "/usr/gnu" else "/usr"; stdenv = stdenvBoot0; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46409086d33..f4c9f1a9adf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2787,7 +2787,7 @@ let automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { doCheck = !stdenv.isArm && !stdenv.isCygwin # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. - && stdenv.system != "i386-sunos"; + && stdenv.system != "i686-solaris"; }; automoc4 = callPackage ../development/tools/misc/automoc4 { };