Unverified Commit 6e5cce71 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #183997 from alyssais/isAarch

parents 6a894dc6 153bfc99

nixos/lib/qemu-common.nix

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ rec { 
    ];



  qemuSerialDevice = if pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isRiscV then "ttyS0"

        else if (with pkgs.stdenv.hostPlatform; isAarch32 || isAarch64 || isPower) then "ttyAMA0"

        else if (with pkgs.stdenv.hostPlatform; isAarch || isPower) then "ttyAMA0"

        else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";



  qemuBinary = qemuPkg: {

nixos/modules/hardware/all-firmware.nix

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ in { 
        alsa-firmware

        sof-firmware

        libreelec-dvb-firmware

      ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware

      ] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware

        ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [

        rtl8723bs-firmware

      ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [

nixos/modules/installer/cd-dvd/iso-image.nix

+2 −2
Original line number Diff line number Diff line
@@ -476,9 +476,9 @@ in 


    isoImage.squashfsCompression = mkOption {

      default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% "

                + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86"

                + lib.optionalString isx86 "-Xbcj x86"

                # Untested but should also reduce size for these platforms

                + lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm"

                + lib.optionalString isAarch "-Xbcj arm"

                + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"

                + lib.optionalString (isSparc) "-Xbcj sparc";

      description = ''

nixos/modules/profiles/all-hardware.nix

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ in 


      # Hyper-V support.

      "hv_storvsc"

    ] ++ lib.optionals (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [

    ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [

      # Most of the following falls into two categories:

      #  - early KMS / early display

      #  - early storage (e.g. USB) support

nixos/modules/services/home-automation/home-assistant.nix

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ in { 
        "default_config"

        "met"

        "esphome"

      ] ++ optionals (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) [

      ] ++ optionals pkgs.stdenv.hostPlatform.isAarch [

        # Use the platform as an indicator that we might be running on a RaspberryPi and include

        # relevant components

        "rpi_power"