summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-11-21 14:11:04 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-11-21 14:11:04 +0000
commit5abed12234b39120cb0e509114838fb56d7ff41f (patch)
tree30c51c58f0940d7f2257dc7e6098d37d2c8d8bfc /pkgs/development
parentcf4a0bdce9783de271cc668a4c13cd09a7af6afc (diff)
downloadnixlib-5abed12234b39120cb0e509114838fb56d7ff41f.tar
nixlib-5abed12234b39120cb0e509114838fb56d7ff41f.tar.gz
nixlib-5abed12234b39120cb0e509114838fb56d7ff41f.tar.bz2
nixlib-5abed12234b39120cb0e509114838fb56d7ff41f.tar.lz
nixlib-5abed12234b39120cb0e509114838fb56d7ff41f.tar.xz
nixlib-5abed12234b39120cb0e509114838fb56d7ff41f.tar.zst
nixlib-5abed12234b39120cb0e509114838fb56d7ff41f.zip
* i386-sunos -> i686-solaris.
svn path=/nixpkgs/trunk/; revision=30507
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/ncurses/default.nix2
-rw-r--r--pkgs/development/tools/misc/autoconf/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 6e15dca01f33..b503493ac88e 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -8,7 +8,7 @@ let
      <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
      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 82f8b1100541..ce18fd1a377a 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!