alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* i386-sunos -> i686-solaris.

Browse source 
svn path=/nixpkgs/trunk/; revision=30507
This commit is contained in:
Eelco Dolstra 2011-11-21 14:11:04 +00:00
parent cf4a0bdce9
commit 5abed12234
5 changed files with 9 additions and 8 deletions
pkgs
development
libraries/ncurses
default.nix
tools/misc/autoconf
default.nix
stdenv
generic
default.nix
native
default.nix
top-level
all-packages.nix

2
pkgs/development/libraries/ncurses/default.nix
View file

@ -8,7 +8,7 @@ let
<http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>, <http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
but this is left as an exercise to the reader. but this is left as an exercise to the reader.
So disable them for now. */ So disable them for now. */
cxx = stdenv.system != "i386-sunos"; cxx = stdenv.system != "i686-solaris";
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "ncurses-5.7"; name = "ncurses-5.7";

2
pkgs/development/tools/misc/autoconf/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# details. # details.
# There are many test failures on `i386-pc-solaris2.11'. # There are many test failures on `i386-pc-solaris2.11'.
doCheck = (stdenv.system != "i686-cygwin" 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 # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
# "fixed" path in generated files! # "fixed" path in generated files!

3
pkgs/stdenv/generic/default.nix
View file

@ -98,7 +98,8 @@ let
|| result.system == "powerpc-linux" || result.system == "powerpc-linux"
|| result.system == "armv5tel-linux" || result.system == "armv5tel-linux"
|| result.system == "mips64-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"; isCygwin = result.system == "i686-cygwin";
isFreeBSD = result.system == "i686-freebsd" isFreeBSD = result.system == "i686-freebsd"
|| result.system == "x86_64-freebsd"; || result.system == "x86_64-freebsd";

8
pkgs/stdenv/native/default.nix
View file

@ -3,12 +3,12 @@
rec { rec {
shell = shell =
if system == "i686-freebsd" || system == "x86_64-freebsd" if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
then "/usr/local/bin/bash" else if system == "i686-solaris" then "/usr/bin/bash"
else "/bin/bash"; else "/bin/bash";
path = 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 []) ++ (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
["/" "/usr" "/usr/local"]; ["/" "/usr" "/usr/local"];
@ -115,7 +115,7 @@ rec {
name = "gcc-native"; name = "gcc-native";
nativeTools = true; nativeTools = true;
nativeLibc = 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; stdenv = stdenvBoot0;
}; };

2
pkgs/top-level/all-packages.nix
View file

@ -2787,7 +2787,7 @@ let
automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix {
doCheck = !stdenv.isArm && !stdenv.isCygwin doCheck = !stdenv.isArm && !stdenv.isCygwin
# Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. # 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 { }; automoc4 = callPackage ../development/tools/misc/automoc4 { };