From 6540b0e49aa167681378406b040e4dc2c517d2ef Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 21 Jan 2020 11:34:18 +0100 Subject: [PATCH] apps.nova-image: override CORE_NOVA via environment --- apps/nova-image/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/nova-image/default.nix b/apps/nova-image/default.nix index acfbd29..20cb78a 100644 --- a/apps/nova-image/default.nix +++ b/apps/nova-image/default.nix @@ -21,8 +21,6 @@ in nixpkgs.writeScriptBin "nova-image" (with nixpkgs.buildPackages; CC="${cc}/bin/${cc.targetPrefix}cc" LD="${buildPackages.binutils}/bin/${buildPackages.binutils.targetPrefix}ld" - CORE_NOVA="${base-nova}/lib/core-nova.o" - TMPDIR="$(${coreutils}/bin/mktemp -d)" 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 \ -z max-page-size=0x1000 \ -Ttext=0x100000 -gc-sections \ - "$CORE_NOVA" "$TMPDIR/boot_modules.o" \ + "''${CORE_NOVA:-${base-nova}/lib/core-nova.o}" "$TMPDIR/boot_modules.o" \ -o "$out" '')