diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-10-02 20:03:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 20:03:37 -0400 |
| commit | 7eace49cc5cd66de17a6c5e791f183e6f9c9541a (patch) | |
| tree | 86de577fe0c857cf7ee2af1a40486d11f66a820a | |
| parent | 3dc58eda52ef935313cd0418264abd1d30d6b4d3 (diff) | |
| parent | 1f289463acf259af314a5aaa66da74a1e9de09c6 (diff) | |
| download | nixlib-7eace49cc5cd66de17a6c5e791f183e6f9c9541a.tar nixlib-7eace49cc5cd66de17a6c5e791f183e6f9c9541a.tar.gz nixlib-7eace49cc5cd66de17a6c5e791f183e6f9c9541a.tar.bz2 nixlib-7eace49cc5cd66de17a6c5e791f183e6f9c9541a.tar.lz nixlib-7eace49cc5cd66de17a6c5e791f183e6f9c9541a.tar.xz nixlib-7eace49cc5cd66de17a6c5e791f183e6f9c9541a.tar.zst nixlib-7eace49cc5cd66de17a6c5e791f183e6f9c9541a.zip | |
Merge pull request #69917 from lopsided98/linux-rpi-1-dtb-rename
linux_rpi1: fix Raspberry Pi Zero device tree file name
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-rpi.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index b383abdef1dc..f8ad6b37a190 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -49,8 +49,8 @@ lib.overrideDerivation (buildLinux (args // { cp -v "$dtbDir/$1" "$dtbDir/$2" } '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv6l-linux"]) '' - copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb - copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb + copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb + copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb |