diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-07-30 16:18:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-07-30 16:18:27 +0000 |
| commit | 5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31 (patch) | |
| tree | a01c14914ae8c135631a105e30a0ca339f9b71ee /pkgs/os-specific/linux | |
| parent | 64915e05bfdd3f0af9d1c6145184c8347550efd0 (diff) | |
| download | nixpkgs-5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31.tar nixpkgs-5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31.tar.gz nixpkgs-5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31.tar.bz2 nixpkgs-5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31.tar.lz nixpkgs-5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31.tar.xz nixpkgs-5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31.tar.zst nixpkgs-5330c0a1afe9d97d6f6366157cf0d3da9a8e7c31.zip | |
treewide: use isAarch where appropriate
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/nmon/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/rtl8189es/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/rtl8812au/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 9372018f5b7..e3ab199399e 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ with stdenv.targetPlatform; if isx86_32 || isx86_64 then "X86" - else if isAarch32 || isAarch64 then "ARM" + else if isAarch then "ARM" else if isPower then "POWER" else "UNKNOWN" }"; diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index c1032473db1..a755404e6e5 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) - ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) ]; preInstall = '' diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index b385b9a27da..30f04c1eb8b 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "ARCH=${stdenv.hostPlatform.linuxArch}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) - ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; |