summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock6
-rw-r--r--flake.nix1
-rw-r--r--meson_options.txt1
-rw-r--r--subprojects/libalabaster.wrap4
-rw-r--r--subprojects/libnaunet.wrap4
-rw-r--r--subprojects/stela.wrap4
-rw-r--r--taro/ui.c2
7 files changed, 12 insertions, 10 deletions
diff --git a/flake.lock b/flake.lock
index 4ab3227..a7457cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1761672384,
- "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+ "lastModified": 1764517877,
+ "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
+ "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 9a85511..4296af1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,6 +79,7 @@
];
fixupPhase = ''
wrapProgram $out/bin/taro --prefix LD_LIBRARY_PATH : "$out/lib64"
+ wrapProgram $out/bin/mauri --set __EGL_VENDOR_LIBRARY_DIRS "${pkgs.mesa}/share/glvnd/egl_vendor.d"
'';
meta = with lib; {
homepage = "https://git.akon.city/mauri";
diff --git a/meson_options.txt b/meson_options.txt
index 1e7fc37..317d67b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
option('window', type: 'combo', choices: ['wayland', 'x11', 'win32'], value: 'wayland')
option('taro', type: 'feature', value: 'enabled')
option('audio', type: 'feature', value: 'disabled')
+option('tests', type: 'feature', value: 'disabled', yield: true)
diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index 145c015..4b277ec 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = libalabaster-0d1bc6c
+directory = libalabaster-b5b7657
url = https://git.akon.city/libalabaster.git
push-url = git@git.akon.city:libalabaster.git
-revision = 0d1bc6cf7483d2a53c2d5f04d15a0ce3da85f29b
+revision = b5b765781482a7b3ff6026ea71b4eb35a0a155d0
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap
index df923b0..531910f 100644
--- a/subprojects/libnaunet.wrap
+++ b/subprojects/libnaunet.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = libnaunet-5edcdda
+directory = libnaunet-1e0f603
url = https://git.akon.city/libnaunet.git
push-url = git@git.akon.city:libnaunet.git
-revision = 5edcdda9efadd7c6ff5a47bef2897c0eb995057f
+revision = 1e0f60341192c79bf49e84e6b187ffb7bfded252
diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap
index 7122113..fda63dd 100644
--- a/subprojects/stela.wrap
+++ b/subprojects/stela.wrap
@@ -1,5 +1,5 @@
[wrap-git]
-directory = stela-9d69eec
+directory = stela-22e9e4d
url = https://git.akon.city/stela.git
push-url = git@git.akon.city:stela.git
-revision = 9d69eec9ab48f009a04b9ab710f57c85b240dd19
+revision = 22e9e4d6e2c2e8e5eea065e5b7cd04fa6626559c
diff --git a/taro/ui.c b/taro/ui.c
index 25aa844..6d191d7 100644
--- a/taro/ui.c
+++ b/taro/ui.c
@@ -1309,7 +1309,7 @@ s32 main(void)
if (!nn_common_init(NULL)) return exit_status;
if (open_config(&u.conf, false) != CONFIG_LOADED) {
- log_error("failed to open config, run `tarod` at least once to generate the required config");
+ log_error("failed to open config, run `tarod` at least once to generate the required files");
nn_common_close();
return exit_status;
}