From 2aa7799528e26d0900fb046560b0937351516e8e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 2 Jan 2022 17:46:41 +0100 Subject: [PATCH] nimPackages.nimBuilder: collect deps from $pkgsHostTarget --- pkgs/development/nim-packages/build-nim-package/default.nix | 2 +- pkgs/development/nim-packages/nim_builder/nim_builder.nim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix index acf67b9f8977..f8301ebb4880 100644 --- a/pkgs/development/nim-packages/build-nim-package/default.nix +++ b/pkgs/development/nim-packages/build-nim-package/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (attrs // { configurePhase = if isNull configurePhase then '' runHook preConfigure - find $NIX_BUILD_TOP -name .attrs.json + export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS nim_builder --phase:configure runHook postConfigure '' else diff --git a/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/pkgs/development/nim-packages/nim_builder/nim_builder.nim index 90dcb46588b7..0cb68e63f137 100644 --- a/pkgs/development/nim-packages/nim_builder/nim_builder.nim +++ b/pkgs/development/nim-packages/nim_builder/nim_builder.nim @@ -97,7 +97,7 @@ proc configurePhase*() = for def in getEnv("nimDefines").split: if def != "": switch("define", def) - for input in getEnv("buildInputs").split: + for input in getEnv("NIX_NIM_BUILD_INPUTS").split: if input != "": for nimbleFile in walkFiles(input / "*.nimble"): let inputSrc = normalizedPath(