apps.nova-image: override CORE_NOVA via environment
This commit is contained in:
parent
7be2a6f17e
commit
6540b0e49a
|
@ -21,8 +21,6 @@ in nixpkgs.writeScriptBin "nova-image" (with nixpkgs.buildPackages;
|
||||||
CC="${cc}/bin/${cc.targetPrefix}cc"
|
CC="${cc}/bin/${cc.targetPrefix}cc"
|
||||||
LD="${buildPackages.binutils}/bin/${buildPackages.binutils.targetPrefix}ld"
|
LD="${buildPackages.binutils}/bin/${buildPackages.binutils.targetPrefix}ld"
|
||||||
|
|
||||||
CORE_NOVA="${base-nova}/lib/core-nova.o"
|
|
||||||
|
|
||||||
TMPDIR="$(${coreutils}/bin/mktemp -d)"
|
TMPDIR="$(${coreutils}/bin/mktemp -d)"
|
||||||
trap "rm -rf $TMPDIR" err exit
|
trap "rm -rf $TMPDIR" err exit
|
||||||
|
|
||||||
|
@ -41,6 +39,6 @@ in nixpkgs.writeScriptBin "nova-image" (with nixpkgs.buildPackages;
|
||||||
-T${base-nova.src}/repos/base-nova/src/core/core-bss.ld \
|
-T${base-nova.src}/repos/base-nova/src/core/core-bss.ld \
|
||||||
-z max-page-size=0x1000 \
|
-z max-page-size=0x1000 \
|
||||||
-Ttext=0x100000 -gc-sections \
|
-Ttext=0x100000 -gc-sections \
|
||||||
"$CORE_NOVA" "$TMPDIR/boot_modules.o" \
|
"''${CORE_NOVA:-${base-nova}/lib/core-nova.o}" "$TMPDIR/boot_modules.o" \
|
||||||
-o "$out"
|
-o "$out"
|
||||||
'')
|
'')
|
||||||
|
|
Loading…
Reference in New Issue