From d55620ba10bdf3a4e9e8afec6de79445c162a3da Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 27 Feb 2019 16:50:01 +0100
Subject: [PATCH] Update Nimble rules for Nim devel branch

---
 nimble/Tuprules.tup |  6 ------
 nimble/binaries.tup | 12 +++++++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nimble/Tuprules.tup b/nimble/Tuprules.tup
index 73e22f318..9ef5f489c 100644
--- a/nimble/Tuprules.tup
+++ b/nimble/Tuprules.tup
@@ -1,8 +1,2 @@
-# Drop the relase flag with the line "NIM_RELEASE_FLAG="
-NIM_RELEASE_FLAG = -d:release 
-
-!nim_to_depot = |> nim cpp $(NIM_RELEASE_FLAG) --os:genode -d:posix -o:%o %f \
-	|> $(DEPOT_DIR)/bin/x86_64/%d/@(DEPOT_VERSION)/%B
-
 NIMBLE_BINARIES_INCLUDE = $(TUP_CWD)/binaries.tup
 NIMBLE_PACKAGE_INCLUDE = $(TUP_CWD)/package.tup
diff --git a/nimble/binaries.tup b/nimble/binaries.tup
index a8a84313a..89650ba14 100644
--- a/nimble/binaries.tup
+++ b/nimble/binaries.tup
@@ -1,8 +1,14 @@
-include_rules
+# Drop the relase flag with the line "NIM_RELEASE_FLAG="
+NIM_RELEASE_FLAG = -d:release
 
-: foreach src/*.nim |> !nim_to_depot |> {binary}
+!nim_build = |> nimble cpp $(NIM_RELEASE_FLAG) --os:genode -d:posix -o:%B %f |> %B %B.json
+
+!nim_to_depot = |> cp %f %o |> $(DEPOT_DIR)/bin/x86_64/%d/@(DEPOT_VERSION)/%b
+
+: foreach src/*.nim |> !nim_build |> {output}
+: foreach {output} |> !nim_to_depot |> {binary}
 
 ifdef DEPOT_KEY
-: {binary}  |> !depot_bin_tarball |> {tarballs}
+: {binary} |> !depot_bin_tarball |> {tarballs}
 : foreach {tarballs} |> !public_signature |>
 endif