From ab90cef3780facf26e38cd463ceda56e550c0d7f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 15 May 2023 18:40:52 +0100
Subject: [PATCH] Move nimsvg to submodule

---
 .gitmodules       |  2 +-
 nimble/Tupfile    |  6 +-----
 nimble/nimsvg.nix | 18 ------------------
 nimsvg            |  1 +
 4 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 nimble/nimsvg.nix
 create mode 160000 nimsvg

diff --git a/.gitmodules b/.gitmodules
index f6973f9..a7da9b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -71,7 +71,7 @@
 	path = svui
 	url = https://git.sr.ht/~ehmry/svui
 [submodule "nimsvg"]
-	path = nimble/nimsvg
+	path = nimsvg
 	url = https://github.com/bluenote10/NimSvg.git
 [submodule "bumpy"]
 	path = bumpy
diff --git a/nimble/Tupfile b/nimble/Tupfile
index 452e77d..cf05625 100644
--- a/nimble/Tupfile
+++ b/nimble/Tupfile
@@ -1,11 +1,7 @@
-export NIX_PATH
-!nix_build = |> ^o ^ nix build --out-link %o |>
+!nix_build = |> ^o nix build %o^ nix build --out-link %o |>
 : |> !nix_build nixpkgs#nimPackages.illwill |> illwill ./<illwill>
 : |> !nix_build nixpkgs#nimPackages.base32 |> base32 ./<base32>
 : |> !nix_build nixpkgs#nimPackages.nimSHA2 |> nimsha2 ./<nimsha2>
 : |> !nix_build nixpkgs#nimPackages.npeg |> npeg ./<npeg>
 : |> !nix_build nixpkgs#nimPackages.flatty |> flatty ./<flatty>
 : |> !nix_build nixpkgs#nimPackages.sdl2 |> sdl2 ./<sdl2>
-
-
-: nimsvg.nix |> !nix_build -f %f |> nimsvg ./<nimsvg>
diff --git a/nimble/nimsvg.nix b/nimble/nimsvg.nix
deleted file mode 100644
index 0ea4097..0000000
--- a/nimble/nimsvg.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-
-pkgs.nimPackages.callPackage ({ lib, buildNimPackage, fetchFromGitHub }:
-
-  buildNimPackage rec {
-    pname = "NimSvg";
-    version = "unstable-2021-06-10";
-
-    src = fetchFromGitHub { # https://github.com/bluenote10/NimSvg
-      owner = "bluenote10";
-      repo = pname;
-      rev = "89e7b31a1937524451fdf57f3e851f293385e8ca";
-      hash = "sha256-U+8UbQvos4ycJUDatGHHeCr/7vX6llVTkDJ7I/9cdAA=";
-    };
-
-    doCheck = true;
-
-  }) { }
diff --git a/nimsvg b/nimsvg
new file mode 160000
index 0000000..89e7b31
--- /dev/null
+++ b/nimsvg
@@ -0,0 +1 @@
+Subproject commit 89e7b31a1937524451fdf57f3e851f293385e8ca