From 18e38018cf4cc8f9689c453f5013426e60bf744a Mon Sep 17 00:00:00 2001
From: Irene Knapp <ireneista@irenes.space>
Date: Sat, 6 Sep 2025 16:04:36 -0700
Subject: add a nix package for the now-forked pollyana

the contents of the patch against upstream kaylee are now applied to the
pollyanna source; the patch is retained in case it's ever useful to
build upstream

Force-Push: yes
Change-Id: I18df6c5b48ee1e767cff259bd323682c8dd693ff
---
 data-location.patch                 | 31 -------------------------------
 flake.nix                           | 28 +++++++++++++++++++++++++++-
 packages/kaylee-data-location.patch | 31 +++++++++++++++++++++++++++++++
 src/kayleevc/kaylee.py              |  3 ++-
 src/setup.py                        |  6 ++++--
 5 files changed, 64 insertions(+), 35 deletions(-)
 delete mode 100644 data-location.patch
 create mode 100644 packages/kaylee-data-location.patch

diff --git a/data-location.patch b/data-location.patch
deleted file mode 100644
index 8c0dd65..0000000
--- a/data-location.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/kayleevc/kaylee.py b/kayleevc/kaylee.py
-index 4e99d1a..7cc927f 100644
---- a/kayleevc/kaylee.py
-+++ b/kayleevc/kaylee.py
-@@ -178,7 +178,8 @@ class Kaylee:
- 
-     def load_resource(self, string):
-         # TODO: Use the Config object for this path management
--        local_data = os.path.join(os.path.dirname(__file__), '..', 'data')
-+        local_data = os.path.join(os.path.dirname(__file__), '..',
-+                                  'usr', 'share', 'kaylee')
-         paths = ["/usr/share/kaylee/", "/usr/local/share/kaylee", local_data]
-         for path in paths:
-             resource = os.path.join(path, string)
-diff --git a/setup.py b/setup.py
-index 34ba60c..b4c32c8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -27,8 +27,10 @@ setup(
-     ],
-     install_requires=["requests"],
-     data_files = [
--        ("/usr/share/kaylee", ["data/icon_inactive.png", "data/icon.png",
--            "options.json.tmp"]),
-+        ("/usr/share/kaylee",
-+         ["data/icon.png", "data/icon_small.png",
-+          "data/icon_inactive.png", "data/icon_inactive_small.png",
-+          "options.json.tmp"]),
-         ("/usr/lib/systemd/user", ["systemd/kaylee.service"])
-     ],
-     entry_points = {
diff --git a/flake.nix b/flake.nix
index d81cb77..3bda2c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,32 @@
       nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
   in {
     packages = forAllSystems (system: let pkgs = nixpkgsFor.${system}; in rec {
+      default = pollyana;
+
+      pollyana = pkgs.python3Packages.buildPythonPackage rec {
+        pname = "KayleeVC";
+        version = "0.1.1";
+
+        src = ./src;
+
+        nativeBuildInputs = with pkgs; [
+          gobject-introspection
+          wrapGAppsHook4
+        ];
+
+        propagatedBuildInputs = (with pkgs; [
+          gtk3
+          pocketsphinx.lib
+        ]) ++ (with pkgs.gst_all_1; [
+          gstreamer
+          gst-plugins-base
+          gst-plugins-good
+        ]) ++ (with pkgs.python3Packages; [
+          requests
+          pygobject3
+        ]);
+      };
+
       kaylee = pkgs.python3Packages.buildPythonPackage rec {
         pname = "KayleeVC";
         version = "0.1.1";
@@ -26,7 +52,7 @@
         };
 
         patches = [
-          ./data-location.patch
+          ./packages/kaylee-data-location.patch
         ];
 
         nativeBuildInputs = with pkgs; [
diff --git a/packages/kaylee-data-location.patch b/packages/kaylee-data-location.patch
new file mode 100644
index 0000000..8c0dd65
--- /dev/null
+++ b/packages/kaylee-data-location.patch
@@ -0,0 +1,31 @@
+diff --git a/kayleevc/kaylee.py b/kayleevc/kaylee.py
+index 4e99d1a..7cc927f 100644
+--- a/kayleevc/kaylee.py
++++ b/kayleevc/kaylee.py
+@@ -178,7 +178,8 @@ class Kaylee:
+ 
+     def load_resource(self, string):
+         # TODO: Use the Config object for this path management
+-        local_data = os.path.join(os.path.dirname(__file__), '..', 'data')
++        local_data = os.path.join(os.path.dirname(__file__), '..',
++                                  'usr', 'share', 'kaylee')
+         paths = ["/usr/share/kaylee/", "/usr/local/share/kaylee", local_data]
+         for path in paths:
+             resource = os.path.join(path, string)
+diff --git a/setup.py b/setup.py
+index 34ba60c..b4c32c8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -27,8 +27,10 @@ setup(
+     ],
+     install_requires=["requests"],
+     data_files = [
+-        ("/usr/share/kaylee", ["data/icon_inactive.png", "data/icon.png",
+-            "options.json.tmp"]),
++        ("/usr/share/kaylee",
++         ["data/icon.png", "data/icon_small.png",
++          "data/icon_inactive.png", "data/icon_inactive_small.png",
++          "options.json.tmp"]),
+         ("/usr/lib/systemd/user", ["systemd/kaylee.service"])
+     ],
+     entry_points = {
diff --git a/src/kayleevc/kaylee.py b/src/kayleevc/kaylee.py
index 4e99d1a..7cc927f 100644
--- a/src/kayleevc/kaylee.py
+++ b/src/kayleevc/kaylee.py
@@ -178,7 +178,8 @@ class Kaylee:
 
     def load_resource(self, string):
         # TODO: Use the Config object for this path management
-        local_data = os.path.join(os.path.dirname(__file__), '..', 'data')
+        local_data = os.path.join(os.path.dirname(__file__), '..',
+                                  'usr', 'share', 'kaylee')
         paths = ["/usr/share/kaylee/", "/usr/local/share/kaylee", local_data]
         for path in paths:
             resource = os.path.join(path, string)
diff --git a/src/setup.py b/src/setup.py
index 34ba60c..b4c32c8 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -27,8 +27,10 @@ setup(
     ],
     install_requires=["requests"],
     data_files = [
-        ("/usr/share/kaylee", ["data/icon_inactive.png", "data/icon.png",
-            "options.json.tmp"]),
+        ("/usr/share/kaylee",
+         ["data/icon.png", "data/icon_small.png",
+          "data/icon_inactive.png", "data/icon_inactive_small.png",
+          "options.json.tmp"]),
         ("/usr/lib/systemd/user", ["systemd/kaylee.service"])
     ],
     entry_points = {
-- 
cgit 1.4.1