From 099e604d4522fe8143eb98402398cbe74d6d846f Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Mon, 11 Nov 2024 22:17:26 +0800
Subject: [PATCH] packages.v-sim: fix

---
 flake.lock         |  7 ++++---
 flake.nix          |  2 +-
 packages/v-sim.nix | 20 +++++++-------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8098bb22..afed9089 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1625,15 +1625,16 @@
     "v-sim": {
       "flake": false,
       "locked": {
-        "lastModified": 1726128818,
-        "narHash": "sha256-DsTsqmboCzTjrykPFde4PyQpjQ2ZW0yUmyWQGkZcYmI=",
+        "lastModified": 1594997908,
+        "narHash": "sha256-+iuu2kuVQEt2CTjo4g/5jnk2ZAllspxujnFuyp7CAMw=",
         "owner": "l_sim",
         "repo": "v_sim",
-        "rev": "8e6b879bcc513d776b31150d7edb4f60049035eb",
+        "rev": "b76501454b489715495a255347d5c7f756e1207f",
         "type": "gitlab"
       },
       "original": {
         "owner": "l_sim",
+        "ref": "master",
         "repo": "v_sim",
         "type": "gitlab"
       }
diff --git a/flake.nix b/flake.nix
index 767483eb..09733548 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,7 +48,7 @@
     matplotplusplus = { url = "github:alandefreitas/matplotplusplus"; flake = false; };
     nameof = { url = "github:Neargye/nameof"; flake = false; };
     tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; flake = false; };
-    v-sim = { url = "gitlab:l_sim/v_sim"; flake = false; };
+    v-sim = { url = "gitlab:l_sim/v_sim/master"; flake = false; };
     rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; };
     blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; flake = false; };
     slate = { url = "github:TheBigWazz/Slate"; flake = false; };
diff --git a/packages/v-sim.nix b/packages/v-sim.nix
index d2ac97d6..edca9ad9 100644
--- a/packages/v-sim.nix
+++ b/packages/v-sim.nix
@@ -1,21 +1,15 @@
 {
-  stdenv, lib, src,
-  wrapGAppsHook, autoreconfHook, autoconf, libtool, intltool, gettext, automake, gtk-doc, pkg-config, gfortran, libxslt,
-  glib, gtk3, libepoxy, libyaml
+  stdenv, src, wrapGAppsHook3, autoreconfHook, gfortran, gtk3, intltool, gtk-doc, pkg-config, libepoxy, libyaml,
+  libxslt, libGLU, wayland, makeWrapper
 }:
 stdenv.mkDerivation
 {
   name = "v-sim";
   inherit src;
-  buildInputs = [ glib gtk3 libepoxy libyaml ];
-  nativeBuildInputs =
-  [
-    autoreconfHook wrapGAppsHook autoconf libtool intltool gettext automake pkg-config
-    gtk-doc gfortran libxslt.bin
-  ];
+  buildInputs = [ gtk3 libepoxy libyaml libGLU ];
+  nativeBuildInputs = [ autoreconfHook wrapGAppsHook3 gfortran intltool gtk-doc pkg-config libxslt makeWrapper ];
   enableParallelBuilding = true;
-  postPatch =
-  ''
-    ./autogen.sh
-  '';
+  postPatch = "./autogen.sh";
+  dontWrapGApps = true;
+  postFixup = ''wrapProgram $out/bin/v_sim "''${gappsWrapperArgs[@]}" --set GDK_BACKEND x11'';
 }