packages.v-sim: fix

This commit is contained in:
2024-11-11 22:17:26 +08:00
parent 4316863da6
commit 099e604d45
3 changed files with 12 additions and 17 deletions

7
flake.lock generated
View File

@@ -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"
}

View File

@@ -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; };

View File

@@ -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'';
}