Small build cleanup and tweak readme

Signed-off-by: Andrew Opalach <andrew@akon.city>

5 files changed, 13 insertions, 17 deletions

diff --git a/README.txt b/README.txt
index 7a061ec..65f5c9c 100644
--- a/README.txt
+++ b/README.txt
@@ -27,14 +27,14 @@
 * wlr-protocols
 
 debian12: +
-{nbsp} common: `sudo apt install git meson cmake pkg-config libegl-dev nlohmann-json3-dev liblz4-dev libstb-dev libglm-dev libjansson-dev libavcodec-dev libavdevice-dev libunistring-dev libdeflate-dev libtinfo-dev` +
-{nbsp} wayland: `sudo apt install libwayland-dev` +
-{nbsp} x11: `sudo apt install libxext-dev libxrandr-dev` +
+{nbsp}common: `sudo apt install git meson cmake pkg-config libegl-dev nlohmann-json3-dev liblz4-dev libstb-dev libglm-dev libjansson-dev libavcodec-dev libavdevice-dev libunistring-dev libdeflate-dev libtinfo-dev` +
+{nbsp}wayland: `sudo apt install libwayland-dev` +
+{nbsp}x11: `sudo apt install libxext-dev libxrandr-dev` +
 
 archlinux: +
-{nbsp} common: `sudo pacman -S --needed git meson cmake libegl nlohmann-json lz4 stb glm jansson ffmpeg libdeflate` +
-{nbsp} wayland: `sudo pacman -S --needed wayland wayland-protocols wlr-protocols` +
-{nbsp} x11: `sudo pacman -S --needed libxext libxrandr` +
+{nbsp}common: `sudo pacman -S --needed git meson cmake libegl nlohmann-json lz4 stb glm jansson ffmpeg libdeflate` +
+{nbsp}wayland: `sudo pacman -S --needed wayland wayland-protocols wlr-protocols` +
+{nbsp}x11: `sudo pacman -S --needed libxext libxrandr` +
 
 === Compiling
 [source,console]
diff --git a/cross/x86_64-w64-mingw32.txt b/cross/x86_64-w64-mingw32.txt
index 55fc1e6..9700058 100644
--- a/cross/x86_64-w64-mingw32.txt
+++ b/cross/x86_64-w64-mingw32.txt
@@ -1,15 +1,11 @@
-# ubuntu: sudo apt install mingw-w64 mingw-w64-tools binutils-mingw-w64 meson cmake nasm libz-mingw-w64-dev
-
 [binaries]
 c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
-ar = 'x86_64-w64-mingw32-gcc-ar'
+ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
 exe_wrapper = 'wine64'
 
 [properties]
-nm = 'x86_64-w64-mingw32-gcc-nm'
-ar = 'x86_64-w64-mingw32-gcc-ar'
 needs_exe_wrapper = true
 
 [host_machine]
diff --git a/flake.lock b/flake.lock
index 933a2f6..a63de06 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "lastModified": 1751792365,
+        "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7534ae8..09cfd12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
         version = "0.14";
         src = fetchgit {
           url = "https://git.akon.city/mauri";
-          rev = "dd5f84bee046fdb62f7ae5f31e3a4bd698de5c4b";
+          rev = "110be42a7d267647241905936c414a53ad18ddae";
           postFetch = ''
             export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
 
@@ -42,7 +42,7 @@
 
             find subprojects -type d -name .git -prune -execdir rm -r {} +
           '';
-          sha256 = "szjmch6j6dhGtQc9k65x8Qph+7OKsN/+94q0hanTCeE=";
+          sha256 = "+2i61fJ0xWU7suXAON17ymfwDeQZA1qODvPaMtHXjoY=";
         };
         nativeBuildInputs = [
           git
diff --git a/meson_options.txt b/meson_options.txt
index f7e67ba..1e7fc37 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,3 @@
-option('window', type: 'combo', choices: ['wayland', 'x11', 'glfw'], value: 'wayland')
+option('window', type: 'combo', choices: ['wayland', 'x11', 'win32'], value: 'wayland')
 option('taro', type: 'feature', value: 'enabled')
 option('audio', type: 'feature', value: 'disabled')