From 65b12673bd4d253756e5a0dab455f9935c54b019 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Wed, 27 Nov 2024 13:31:01 -0500
Subject: Make python a build input

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 flake.nix               | 16 ++++++++--------
 src/portal/cpy/setup.py |  2 +-
 src/portal/meson.build  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index bcff0de..85e1f22 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,6 +76,14 @@
           ant
           jdk8
           wayland-scanner
+          (python3.withPackages (python-pkgs: [
+            python-pkgs.setuptools
+            python-pkgs.pip
+            python-pkgs.cython
+            python-pkgs.certifi
+            python-pkgs.requests
+            python-pkgs.beautifulsoup4
+          ]))
         ];
         buildInputs = [
           (curl.override { websocketSupport = true; })
@@ -133,14 +141,6 @@
           perf-tools
           valgrind
           kcachegrind
-          ((python3.override {}).withPackages (python-pkgs: [
-            python-pkgs.setuptools
-            python-pkgs.pip
-            python-pkgs.cython
-            python-pkgs.certifi
-            python-pkgs.requests
-            python-pkgs.beautifulsoup4
-          ]))
           perl
           asciidoctor
           pandoc
diff --git a/src/portal/cpy/setup.py b/src/portal/cpy/setup.py
index 1a3e39c..7267bff 100644
--- a/src/portal/cpy/setup.py
+++ b/src/portal/cpy/setup.py
@@ -3,4 +3,4 @@ from Cython.Build import cythonize
 from Cython.Compiler import Options
 Options.embed = True
 alabaster_inc = "../../../subprojects/libalabaster/include"
-cythonize([Extension("portal", ["portal.pyx"], include_dirs=[alabaster_inc], extra_link_args=[])], language_level=3)
+cythonize([Extension("portal", ["./portal.pyx"], include_dirs=[alabaster_inc], extra_link_args=[])], language_level=3)
diff --git a/src/portal/meson.build b/src/portal/meson.build
index 4e5ff56..d3904ea 100644
--- a/src/portal/meson.build
+++ b/src/portal/meson.build
@@ -8,7 +8,7 @@ portal_deps = []
 portal_args = ['-DCAMU_HAVE_PORTAL']
 
 cpy_dir = join_paths(meson.current_source_dir(), 'cpy')
-run_command(join_paths(cpy_dir, 'build.sh'), cpy_dir, check: false)
+run_command('sh', join_paths(cpy_dir, 'build.sh'), cpy_dir, check: false)
 
 python3_embed = import('python').find_installation('python3.12').dependency(embed: true)
 portal_deps += [python3_embed]
-- 
cgit v1.2.3-101-g0448