public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
This commit is contained in:
Yury G. Kudryashov
2012-01-26 15:27:03 +00:00
parent f878980c8b d9de74edd6
commit 5b132f6e96
114 changed files with 2051 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/default.nix
+1 -1
View File
@@ -55,7 +55,7 @@ rec {
if stdenvType == "i686-linux" then stdenvLinux else
if stdenvType == "x86_64-linux" then stdenvLinux else
if stdenvType == "armv5tel-linux" then stdenvLinux else
if stdenvType == "mips64-linux" then stdenvLinux else
if stdenvType == "mips64el-linux" then stdenvLinux else
if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
if stdenvType == "i686-mingw" then stdenvMinGW else
if stdenvType == "i686-darwin" then stdenvNix else
pkgs/stdenv/generic/default.nix
+2 -2
View File
@@ -93,7 +93,7 @@ let
|| result.system == "x86_64-linux"
|| result.system == "powerpc-linux"
|| result.system == "armv5tel-linux"
|| result.system == "mips64-linux";
|| result.system == "mips64el-linux";
isSunOS = result.system == "i686-solaris"
|| result.system == "x86_64-solaris";
isCygwin = result.system == "i686-cygwin";
@@ -117,7 +117,7 @@ let
is64bit = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin";
isMips = result.system == "mips-linux"
|| result.system == "mips64-linux";
|| result.system == "mips64el-linux";
isArm = result.system == "armv5tel-linux";
# Utility function: allow stdenv to be easily regenerated with
pkgs/stdenv/linux/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@ rec {
else if system == "x86_64-linux" then import ./bootstrap/x86_64
else if system == "powerpc-linux" then import ./bootstrap/powerpc
else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
else if system == "mips64-linux" then import ./bootstrap/loongson2f
else if system == "mips64el-linux" then import ./bootstrap/loongson2f
else abort "unsupported platform for the pure Linux stdenv";
@@ -25,7 +25,7 @@ rec {
export NIX_ENFORCE_PURITY=1
havePatchELF=1
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
${if system == "mips64-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
'';