diff options
author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-01-18 21:00:58 -0500 |
---|---|---|
committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-01-18 21:00:58 -0500 |
commit | 414c42a697b567c0e711b276cc1342418418aa77 (patch) | |
tree | 5a287393dbfe6d96141b069ff1f34b680849ddad /pkgs/top-level | |
parent | 404773e33673e0bf0ca31ae04f33ea75de76b133 (diff) | |
download | nixlib-414c42a697b567c0e711b276cc1342418418aa77.tar nixlib-414c42a697b567c0e711b276cc1342418418aa77.tar.gz nixlib-414c42a697b567c0e711b276cc1342418418aa77.tar.bz2 nixlib-414c42a697b567c0e711b276cc1342418418aa77.tar.lz nixlib-414c42a697b567c0e711b276cc1342418418aa77.tar.xz nixlib-414c42a697b567c0e711b276cc1342418418aa77.tar.zst nixlib-414c42a697b567c0e711b276cc1342418418aa77.zip |
ubootRock64, ubootRockPro64: use dtc 1.4.5
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9af76373d9f..41b927632098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15302,9 +15302,35 @@ in # Non-upstream U-Boots: ubootNanonote = callPackage ../misc/uboot/nanonote.nix { }; - ubootRock64 = callPackage ../misc/uboot/rock64.nix { }; + inherit (let + dtc = buildPackages.dtc.overrideAttrs (old: rec { + version = "1.4.5"; + src = fetchgit { + url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; + rev = "refs/tags/v${version}"; + sha256 = "10y5pbkcj5gkijcgnlvrh6q2prpnvsgihb9asz3zfp66mcjwzsy3"; + }; + }); + # Newer dtc versions are incompatible with U-Boot 2017.09 + inherit (callPackage ../misc/uboot { + inherit dtc; + buildPackages = buildPackages // { + python2 = buildPackages.python2.override (old: { + packageOverrides = pySelf: pySuper: { + libfdt = pySelf.toPythonModule dtc; + }; + }); + }; + }) buildUBoot; + in { + ubootRock64 = callPackage ../misc/uboot/rock64.nix { + inherit buildUBoot; + }; - ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix { }; + ubootRockPro64 = callPackage ../misc/uboot/rockpro64.nix { + inherit buildUBoot; + }; + }) ubootRock64 ubootRockPro64; uclibc = callPackage ../os-specific/linux/uclibc { }; |