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

Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.

Browse Source 
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
This commit is contained in:
Lluís Batlle i Rossell
2010-09-01 09:50:12 +00:00
parent 8a59e608aa
commit 641f956581
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/default.nix
+2 -2
View File
@@ -14,7 +14,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 == "ict_loongson-2_v0.3_fpu_v0.1-linux" then import ./bootstrap/loongson2f
else if system == "mips64-linux" then import ./bootstrap/loongson2f
else abort "unsupported platform for the pure Linux stdenv";
@@ -23,7 +23,7 @@ rec {
export NIX_ENFORCE_PURITY=1
havePatchELF=1
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
${if system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
${if system == "mips64-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
'';