diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
| commit | 0bc275e63423456d6deb650e146120c39c1e0723 (patch) | |
| tree | 1d33aa707b24fa58952162457e243c731836f99b /nixos/modules/hardware/device-tree.nix | |
| parent | 2e5475381b65290e08d357fa1434bd28d0c21cfa (diff) | |
| download | nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.gz nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.bz2 nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.lz nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.xz nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.tar.zst nixpkgs-0bc275e63423456d6deb650e146120c39c1e0723.zip | |
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged into master This reverts commit 8929989614589ee3acd070a6409b2b9700c92d65.
Diffstat (limited to 'nixos/modules/hardware/device-tree.nix')
| -rw-r--r-- | nixos/modules/hardware/device-tree.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix index 4aa1d6369d1..e0ab37bca63 100644 --- a/nixos/modules/hardware/device-tree.nix +++ b/nixos/modules/hardware/device-tree.nix @@ -68,11 +68,11 @@ let patchShebangs scripts/* substituteInPlace scripts/Makefile.lib \ --replace 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget))' 'DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) -@' - make ${pkgs.stdenv.hostPlatform.linux-kernel.baseConfig} ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" - make dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" + make ${pkgs.stdenv.hostPlatform.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" ''; installPhase = '' - make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" + make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" ''; }; @@ -115,7 +115,7 @@ in options = { hardware.deviceTree = { enable = mkOption { - default = pkgs.stdenv.hostPlatform.linux-kernel.DTB or false; + default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false; type = types.bool; description = '' Build device tree files. These are used to describe the |