diff options
| author | Marius Bakke <[email protected]> | 2019-10-08 19:24:34 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2019-10-08 19:24:34 +0200 |
| commit | d1f3b333e6176a7879ab3742bbebb2a99f61a528 (patch) | |
| tree | 8bd82ce68bd2534a48bf13c7256997f82dd1b3f4 /gnu/packages/bootloaders.scm | |
| parent | e01d384efcdaf564bbb221e43b81e087c8e2af06 (diff) | |
| parent | 861907f01efb1cae7f260e8cb7b991d5034a486a (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 41a2de9706..520728b52c 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -99,7 +99,7 @@ (list "PYTHON=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* "grub-core/Makefile.in" (("/bin/sh") (which "sh"))) @@ -114,7 +114,9 @@ "/sbin/mdadm\""))) ;; Make the font visible. - (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") + (copy-file (assoc-ref (or native-inputs inputs) + "unifont") + "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz") ;; Give the absolute file name of 'ckbcomp'. @@ -355,7 +357,7 @@ menu to select one of the installed operating systems.") (define-public dtc (package (name "dtc") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append @@ -363,7 +365,7 @@ menu to select one of the installed operating systems.") "dtc-" version ".tar.xz")) (sha256 (base32 - "0wh10p42hf5403ipvs0dsxddb6kzfyk2sq4fgid9zqzpr51y8wn6")))) + "07q3mdsvl4smbiakriq3hnsyyd0q344lsm306q0kgz4hjq1p82v6")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -377,6 +379,11 @@ menu to select one of the installed operating systems.") (arguments `(#:make-flags (list "CC=gcc" + + ;; /bin/fdt{get,overlay,put} need help finding libfdt.so.1. + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "SETUP_PREFIX=" (assoc-ref %outputs "out")) "INSTALL=install") |