Update flakeHEADmaster

1 files changed, 17 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index 7f50392..15500f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,7 @@
         version = "0.14";
         src = fetchgit {
           url = "https://git.akon.city/mauri";
-          rev = "0864ca575cc60877228ad938efcbd5676de21d69";
+          rev = "1971938a653ad11ee2775459dc7999ced3451d31";
           postFetch = ''
             export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
 
@@ -49,20 +49,33 @@
             ${lib.getExe meson} subprojects download \
               libalabaster libnaunet stela janus s3tc-dxt-decompression
 
-            cd "$out/subprojects/libalabaster-b5b7657"
+            cd "$out/subprojects/libalabaster-c633226"
             ${lib.getExe meson} subprojects download c89atomic
 
-            cd "$out/subprojects/libnaunet-1e0f603"
+            cd "$out/subprojects/libnaunet-a389b8f"
             ${lib.getExe meson} subprojects download libev
 
             cd "$out"
 
             find subprojects -type d -name .git -prune -execdir rm -r {} +
           '';
-          sha256 = "su8G30rcoI1yqPe5AbfYPgPBCsyweZjf2D2uCiB/dyc=";
+          sha256 = "ktwoNUklVUfNnwOITdSISTOV0QwuTdz6fkdXaiJs3Kc=";
         };
         window = "wayland";
         audio = false;
+        mesonFlags = [
+          "-Dwindow=${window}"
+        ] ++ lib.optionals audio [
+          "-Daudio=enabled"
+        ];
+        nvidia-support = false;
+        fixupPhase = if nvidia-support then ''
+            wrapProgram $out/bin/mauri --set __EGL_VENDOR_LIBRARY_DIRS "${pkgs.mesa}/share/glvnd/egl_vendor.d:${pkgs.linuxPackages.nvidia_x11}/share/glvnd/egl_vendor.d"
+          '' else ''
+            wrapProgram $out/bin/mauri --set __EGL_VENDOR_LIBRARY_DIRS "${pkgs.mesa}/share/glvnd/egl_vendor.d"
+          '' + ''
+            wrapProgram $out/bin/taro --prefix LD_LIBRARY_PATH : "$out/lib64"
+          '';
         nativeBuildInputs = [
           git
           gcc
@@ -98,15 +111,6 @@
         ] ++ lib.optionals (window == "glfw") [
           glfw3
         ];
-        mesonFlags = [
-          "-Dwindow=${window}"
-        ] ++ lib.optionals audio [
-          "-Daudio=enabled"
-        ];
-        fixupPhase = ''
-          wrapProgram $out/bin/mauri --set __EGL_VENDOR_LIBRARY_DIRS "${pkgs.mesa}/share/glvnd/egl_vendor.d:${pkgs.linuxPackages.nvidia_x11}/share/glvnd/egl_vendor.d"
-          wrapProgram $out/bin/taro --prefix LD_LIBRARY_PATH : "$out/lib64"
-        '';
         meta = with lib; {
           homepage = "https://git.akon.city/mauri";
           description = "";