diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-01 09:50:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-01 09:50:12 +0000 |
| commit | 641f95658111036331693b1f77225e246e6b6316 (patch) | |
| tree | 2b66b829290ee790e249c348f40111e445730b46 /pkgs/os-specific | |
| parent | 8a59e608aa8feb4d2cbaebfe95e048f9c5f42350 (diff) | |
| download | nixpkgs-641f95658111036331693b1f77225e246e6b6316.tar nixpkgs-641f95658111036331693b1f77225e246e6b6316.tar.gz nixpkgs-641f95658111036331693b1f77225e246e6b6316.tar.bz2 nixpkgs-641f95658111036331693b1f77225e246e6b6316.tar.lz nixpkgs-641f95658111036331693b1f77225e246e6b6316.tar.xz nixpkgs-641f95658111036331693b1f77225e246e6b6316.tar.zst nixpkgs-641f95658111036331693b1f77225e246e6b6316.zip | |
Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.
(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
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 6120c1b8a0d..b1916e8aab1 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, # so we disable -Werror in it patchPhase = if (stdenv.system == "armv5tel-linux" || - stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux") + stdenv.system == "mips64-linux") then '' sed -i s/-Werror// src/Makefile.am '' else ""; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index f5dd09a2ccc..6972171b136 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -42,7 +42,7 @@ }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - || stdenv.system == "armv5tel-linux" || stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux"; + || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64-linux"; assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; @@ -99,7 +99,7 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "armv5tel-linux" then "arm" else - if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then "mips" else + if stdenv.system == "mips64-linux" then "mips" else abort "Platform ${stdenv.system} is not supported."; crossAttrs = let diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 0053d89b605..692643505e1 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ flex cracklib ] ++ stdenv.lib.optional - (stdenv.system != "armv5tel-linux" && stdenv.system != "ict_loongson-2_v0.3_fpu_v0.1-linux") + (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64-linux") libxcrypt; postInstall = '' |