Update Nim submodules

.gitmodules

@@ -75,7 +75,7 @@
 	url = git@github.com:ehmry/blueMSX-libretro.git
 [submodule "nimble/fetch_and_copy"]
 	path = nim/fetch_and_copy
-	url = git@github.com:ehmry/fetch_and_copy.git
+	url = git://depot.h4ck.me/srv/git/fetch_and_copy.
 [submodule "nimble/nim"]
 	path = nim/nim
 	url = https://github.com/ehmry/nim.git

Tuprules.tup

@@ -25,8 +25,6 @@ STUB_DIR = $(TUP_CWD)/stub
 export NIX_PATH
 NIX_BUILD = nix-build --option substitute false
 
-&STUB_DIR = upstream/stub
-
 LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
 
 !prg = | $(GENODE_DIR)/<stub> $(GENODE_DIR)/<pkg-config> \
@@ -155,6 +153,7 @@ AS_OPT += $(AS_MARCH)
 LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
 
 PKG_CONFIG_DIR = $(TUP_CWD)/pkg-config
+&PKG_CONFIG_DIR = pkg-config
 
 PKG_CONFIG_PATH = $(PKG_CONFIG_DIR)
 PKG_CONFIG = PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config

nim/README.md

@@ -4,6 +4,6 @@ the repository contains an `*,nimble`, an `archives`, and a `runtime` file.
 
 ```tup
 include_rules
-include $(NIMBLE_BINARIES_INCLUDE)
-include $(NIMBLE_PACKAGE_INCLUDE)
+include &(NIMBLE_BINARIES_INCLUDE)
+include &(NIMBLE_PACKAGE_INCLUDE)
 ```

nim/Tuprules.tup

@@ -1,5 +1,15 @@
 # Nim default variables
 
+ifeq (@(TUP_ARCH),arm64)
+	NIM_CPU = arm64
+endif
+ifeq (@(TUP_ARCH),i386)
+	NIM_CPU = i386
+endif
+ifeq (@(TUP_ARCH),x86_64)
+	NIM_CPU = amd64
+endif
+
 NIM_RELEASE_FLAG = -d:release
 	# Drop the relase flag with the line "NIM_RELEASE_FLAG="
 
@@ -9,5 +19,15 @@ NIM_SRC_DIR = src
 BIN_VERSION = $(GIT_VERSION)
 	# Use the git version as the binary package version
 
-NIMBLE_BINARIES_INCLUDE = $(TUP_CWD)/binaries.tup
-NIMBLE_PACKAGE_INCLUDE = $(TUP_CWD)/package.tup
+&NIMBLE_BINARIES_INCLUDE = binaries.tup
+&NIMBLE_PACKAGE_INCLUDE = package.tup
+
+!nim_build = | $(GENODE_DIR)/<pkg-config> $(GENODE_DIR)/<stub> \
+|> ^o Nimble %B^ \
+	PKG_CONFIG_PATH=`pwd`/$(PKG_CONFIG_DIR) \
+	nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) \
+	--cpu:$(NIM_CPU) --os:genode -d:posix \
+	--parallelBuild:1 --passL:-L`pwd`/$(STUB_DIR) -o:%B %f \
+|> %B ./<binaries>
+	# Nim may invoke the C++ compiler at an arbitrary location,
+	# thus the relative $(PKG_CONFIG_DIR) is prepended with `pwd`

nim/binaries.tup

@@ -1,17 +1,3 @@
-ifeq (@(TUP_ARCH),arm64)
-	CPU = arm64
-endif
-ifeq (@(TUP_ARCH),i386)
-	CPU = i386
-endif
-ifeq (@(TUP_ARCH),x86_64)
-	CPU = amd64
-endif
-
-!nim_build = |> ^o Nimble %B^ \
-	PKG_CONFIG_PATH=@(PKG_CONFIG_PATH) PATH=$PATH:@(TOOLCHAIN_PATH) nimble cpp $(NIM_RELEASE_FLAG) $(NIM_FLAGS) --cpu:$(CPU) --os:genode -d:posix --parallelBuild:1 -o:%B %f \
-|> %B ./<binaries>
-
 : foreach $(NIM_SRC_DIR)/*.nim |> !nim_build |> {binary}
 : foreach {binary} |> !collect_bin |>
 : |> !bin |>

nim/blobsets

@@ -1 +1 @@
-Subproject commit 2cc154f6b6d718ed4473fb4544547a7e4a5d5dee
+Subproject commit aaa61aebd895e60de28936711b6231d9e555888a

nim/carn_layouter

@@ -1 +1 @@
-Subproject commit 75cf89f0abe715074b959b737e14bdb20c4ea412
+Subproject commit 48b29f8d699571eb79ac73e248754e464f6b9bc7

nim/fetch_and_copy

@@ -1 +1 @@
-Subproject commit b435efd9befcb1cf12bc7aa5ad5a71e759c6b8f1
+Subproject commit 80a63d06a41230f98a44b09c8167d14275efee7c

nim/icy_client

@@ -1 +1 @@
-Subproject commit 9d59f400f2a2c98be84c0598847dec9244b78cf3
+Subproject commit c16dd1b093dface9bb8be00da5edbc4b790363cc

nim/imap_report

@@ -1 +1 @@
-Subproject commit bb47512970e1f7bdc453d5687a1239d203efb788
+Subproject commit e8abc833f3522794ea691e36f561fe8bf2481af4

nim/musicbrainz_playlist_generator

@@ -1 +1 @@
-Subproject commit 3961d2ee7000236f9a35ac878d81643e0eb29d48
+Subproject commit 84c694a34b489157ce222de1b77d67f0775f9993

nim/nim-genode

@@ -1 +1 @@
-Subproject commit e100bf80fbef15aa0b741bb1f58a976054142a02
+Subproject commit 1d58fcff44e4ad94a5fd5983e64989ba312f7d70

nim/nim-monero

@@ -1 +1 @@
-Subproject commit 5109915ac162cd356a4fc06e367e790eb8024d62
+Subproject commit a50208a35aec3031c81f5b4d6141498465ebcf90

nim/ninep

@@ -1 +1 @@
-Subproject commit 7889d655acdff0fcab8c939e93f7700ff6ea0d36
+Subproject commit 739918bcd740f1c3447d3fe54ff275919762c5fe

nim/xspf_view

@@ -1 +1 @@
-Subproject commit 40ae6930ebc57cae6b1161344d10c899c6bfa6bd
+Subproject commit 066b2c3fb9c005e1f29ee9a7c1b0431882790116