Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is. Anyone having the old nix should use a nixpkgs previous to this change to build the new nix. And then, with the new nix, he can use any newer nixpkgs revision. svn path=/nixpkgs/trunk/; revision=31751
This commit is contained in:
@@ -260,8 +260,8 @@ stdenv.mkDerivation ({
|
||||
)
|
||||
)
|
||||
}
|
||||
${ # Trick that should be taken out once we have a mips64-linux not loongson2f
|
||||
if cross == null && stdenv.system == "mips64-linux" then "--with-arch=loongson2f" else ""}
|
||||
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
|
||||
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
|
||||
${if langAda then " --enable-libada" else ""}
|
||||
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
|
||||
${if cross != null then crossConfigureFlags else ""}
|
||||
|
||||
@@ -270,8 +270,8 @@ stdenv.mkDerivation ({
|
||||
)
|
||||
)
|
||||
}
|
||||
${ # Trick that should be taken out once we have a mips64-linux not loongson2f
|
||||
if cross == null && stdenv.system == "mips64-linux" then "--with-arch=loongson2f" else ""}
|
||||
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
|
||||
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
|
||||
${if langAda then " --enable-libada" else ""}
|
||||
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
|
||||
${if cross != null then crossConfigureFlags else ""}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# I could not build it in armv5tel-linux or the fuloon2f
|
||||
assert stdenv.system != "armv5tel-linux";
|
||||
assert stdenv.system != "mips64-linux";
|
||||
assert stdenv.system != "mips64el-linux";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libxcrypt-3.0.2";
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional
|
||||
(stdenv.system == "mips64-linux") ./mips_wmb.patch;
|
||||
(stdenv.system == "mips64el-linux") ./mips_wmb.patch;
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = "--disable-werror" # needed for dietlibc build
|
||||
+ stdenv.lib.optionalString (stdenv.system == "mips64-linux")
|
||||
+ stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
|
||||
" --enable-fix-loongson2f-nop"
|
||||
+ stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
|
||||
+ stdenv.lib.optionalString gold " --enable-gold";
|
||||
|
||||
Reference in New Issue
Block a user