From c4889f9806f91a5da2da670bfdb272b044adb1f2 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Wed, 26 Jun 2024 19:19:05 +0100
Subject: [PATCH] fix(nix): correctly derive version number and use cleanSource

---
 package.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/package.nix b/package.nix
index e61da65..596c108 100644
--- a/package.nix
+++ b/package.nix
@@ -8,23 +8,16 @@
 }:
 let
   runtimeBinDependencies = [ gnome.zenity ];
-  versionMatches =
-    builtins.match ''
-      .*
-      version:[[:blank:]]"([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)"
-      .*
-    '' (builtins.readFile ./pubspec.yaml);
+  versionMatches = builtins.match ''
+    .*
+    .*version:[[:blank:]]([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\+?[[:digit:]]*)
+    .*
+  '' (builtins.readFile ./pubspec.yaml);
 in
 flutter.buildFlutterApplication rec {
   pname = "quickgui";
   version = builtins.concatStringsSep "" versionMatches;
-  src = fetchFromGitHub {
-    owner = "quickemu-project";
-    repo = "quickgui";
-    #rev = version;
-    rev = "d4893b5d2cb2e7ef271e4c2d66683e30d70352e2";
-    hash = "sha256-V9wSENva/5Khqzor+Umj7BooWecDqn91Bj+waDMMPyY=";
-  };
+  src = lib.cleanSource ./.;
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
   gitHashes = {