nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Coreutils update and Illumos compatibility fixes.

Browse Source 
- GNU Coreutils 8.21
- Add is64Bit checks to stdenv for Solaris.
- Fix OpenSSL Illumos build.
This commit is contained in:
Danny Wilson 2013-02-20 09:18:26 +00:00 committed by Danny Wilson
parent d505b8c490
commit cf42601f92
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openssl/default.nix
View File

@ -53,7 +53,9 @@ stdenv.mkDerivation {
# On x86_64-darwin, "./config" misdetects the system as # On x86_64-darwin, "./config" misdetects the system as
# "darwin-i386-cc". So specify the system type explicitly. # "darwin-i386-cc". So specify the system type explicitly.
configureScript = configureScript =
if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
else "./config";
configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";

6
pkgs/stdenv/generic/default.nix
View File

@ -114,11 +114,13 @@ let
isx86_64 = result.system == "x86_64-linux" isx86_64 = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin" || result.system == "x86_64-darwin"
|| result.system == "x86_64-freebsd" || 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" is64bit = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin" || result.system == "x86_64-darwin"
|| result.system == "x86_64-freebsd" || 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" isMips = result.system == "mips-linux"
|| result.system == "mips64el-linux"; || result.system == "mips64el-linux";
isArm = result.system == "armv5tel-linux" isArm = result.system == "armv5tel-linux"

12
pkgs/tools/misc/coreutils/default.nix
View File

@ -6,12 +6,12 @@
assert aclSupport -> acl != null; assert aclSupport -> acl != null;
assert selinuxSupport -> libselinux != null && libsepol != null; assert selinuxSupport -> libselinux != null && libsepol != null;
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "coreutils-8.20"; name = "coreutils-8.21";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/coreutils/${name}.tar.xz"; url = "mirror://gnu/coreutils/${name}.tar.xz";
sha256 = "1cly97xdy3v4nbbx631k43smqw0nnpn651kkprs0yyl2cj3pkjyv"; sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd";
}; };
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
@ -67,4 +67,8 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }
# May have some issues with root compilation because the bootstrap tool
# cannot be used as a login shell for now.
// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) {
FORCE_UNSAFE_CONFIGURE = 1;
})