diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/bootloaders.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 769238203c..d1de5cea4e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -465,7 +465,6 @@ tree binary files. These are board description files used by Linux and BSD.") ("python" ,python) ("python-coverage" ,python-coverage) ("python-pytest" ,python-pytest) - ("sdl2" ,sdl2) ("swig" ,swig))) (build-system gnu-build-system) (home-page "https://www.denx.de/wiki/U-Boot/") @@ -478,6 +477,9 @@ also initializes the boards (RAM etc).") (package (inherit u-boot) (name "u-boot-tools") + (native-inputs + `(("sdl2" ,sdl2) + ,@(package-native-inputs u-boot))) (arguments `(#:make-flags '("HOSTCC=gcc") #:test-target "tests" |