summary refs log tree commit diff
path: root/pkgs/development/nim-packages
diff options
context:
space:
mode:
authorEmery Hemingway <ehmry@posteo.net>2022-01-02 17:46:41 +0100
committerehmry <ehmry@posteo.net>2022-01-07 12:44:22 +0100
commit2aa7799528e26d0900fb046560b0937351516e8e (patch)
tree6efeb4862e2c285af9349b10601c1e7d5841eb4f /pkgs/development/nim-packages
parent8e0f7fd8e3f63929eea26ae356ae8cdc43db2e75 (diff)
downloadnixpkgs-2aa7799528e26d0900fb046560b0937351516e8e.tar
nixpkgs-2aa7799528e26d0900fb046560b0937351516e8e.tar.gz
nixpkgs-2aa7799528e26d0900fb046560b0937351516e8e.tar.bz2
nixpkgs-2aa7799528e26d0900fb046560b0937351516e8e.tar.lz
nixpkgs-2aa7799528e26d0900fb046560b0937351516e8e.tar.xz
nixpkgs-2aa7799528e26d0900fb046560b0937351516e8e.tar.zst
nixpkgs-2aa7799528e26d0900fb046560b0937351516e8e.zip
nimPackages.nimBuilder: collect deps from $pkgsHostTarget
Diffstat (limited to 'pkgs/development/nim-packages')
-rw-r--r--pkgs/development/nim-packages/build-nim-package/default.nix2
-rw-r--r--pkgs/development/nim-packages/nim_builder/nim_builder.nim2
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 acf67b9f897..f8301ebb488 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 90dcb46588b..0cb68e63f13 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(