diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 20:33:55 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-23 10:01:28 -0500 |
| commit | 9c213398b312e0f0bb9cdf05090fd20223a82ad0 (patch) | |
| tree | c645a940abedfc4abf51dbb99ce1a8e871e5e799 /nixos/modules/hardware/device-tree.nix | |
| parent | 2bc16b381e09eeb75deefdf6fd5bdc4771b795f3 (diff) | |
| download | nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.gz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.bz2 nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.lz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.xz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.zst nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.zip | |
lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that commit for details. This reverts commit 0bc275e63423456d6deb650e146120c39c1e0723.
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 e0ab37bca63..4aa1d6369d1 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.platform.kernelBaseConfig} ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" - make dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + make ${pkgs.stdenv.hostPlatform.linux-kernel.baseConfig} ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" + make dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" ''; installPhase = '' - make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.platform.kernelArch}" + make dtbs_install INSTALL_DTBS_PATH=$out/dtbs ARCH="${pkgs.stdenv.hostPlatform.linuxArch}" ''; }; @@ -115,7 +115,7 @@ in options = { hardware.deviceTree = { enable = mkOption { - default = pkgs.stdenv.hostPlatform.platform.kernelDTB or false; + default = pkgs.stdenv.hostPlatform.linux-kernel.DTB or false; type = types.bool; description = '' Build device tree files. These are used to describe the |