diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-11-20 17:50:41 -0800 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-11-20 17:50:41 -0800 |
| commit | 2175b157acf1fd338021bc162ec7c4d6d7f90306 (patch) | |
| tree | 42240c01e72f022fd6d3bb2664960745e9ff757a /pkgs/os-specific/linux | |
| parent | 6aded65e28c8805bfb81e6b5fc1613633480eb16 (diff) | |
| download | nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.gz nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.bz2 nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.lz nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.xz nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.tar.zst nixpkgs-2175b157acf1fd338021bc162ec7c4d6d7f90306.zip | |
treewide: refactor isi686 && isx86_64 -> isx86
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/fbterm/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/read-edid/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/rtl8812au/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 4fdbb06c521..ecf1b5e2b31 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -9,7 +9,7 @@ let sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; buildInputs = [ gpm freetype fontconfig ncurses ] - ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86; + ++ lib.optional stdenv.hostPlatform.isx86 libx86; in stdenv.mkDerivation { inherit (s) pname version; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 0333a9e4310..e6c43c0aa6e 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -58,7 +58,7 @@ let setuptools ]); - isx86 = stdenv.isx86_64 || stdenv.isi686; + isx86 = stdenv.hostPlatform.isx86; # Dell isn't supported on Aarch64 haveDell = isx86; diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 24ad0674976..7f6d224ff4d 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86; + buildInputs = lib.optional stdenv.hostPlatform.isx86 libx86; - cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.isi686 || stdenv.isx86_64 then "ON" else "OFF"}" ]; + cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.hostPlatform.isx86 then "ON" else "OFF"}" ]; patchPhase = '' substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 1aab3e03cd9..b385b9a27da 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" "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_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")) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" |