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": { "v-sim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726128818, "lastModified": 1594997908,
"narHash": "sha256-DsTsqmboCzTjrykPFde4PyQpjQ2ZW0yUmyWQGkZcYmI=", "narHash": "sha256-+iuu2kuVQEt2CTjo4g/5jnk2ZAllspxujnFuyp7CAMw=",
"owner": "l_sim", "owner": "l_sim",
"repo": "v_sim", "repo": "v_sim",
"rev": "8e6b879bcc513d776b31150d7edb4f60049035eb", "rev": "b76501454b489715495a255347d5c7f756e1207f",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"owner": "l_sim", "owner": "l_sim",
"ref": "master",
"repo": "v_sim", "repo": "v_sim",
"type": "gitlab" "type": "gitlab"
} }

View File

@@ -48,7 +48,7 @@
matplotplusplus = { url = "github:alandefreitas/matplotplusplus"; flake = false; }; matplotplusplus = { url = "github:alandefreitas/matplotplusplus"; flake = false; };
nameof = { url = "github:Neargye/nameof"; flake = false; }; nameof = { url = "github:Neargye/nameof"; flake = false; };
tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; 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; }; rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; };
blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; flake = false; }; blurred-wallpaper = { url = "github:bouteillerAlan/blurredwallpaper"; flake = false; };
slate = { url = "github:TheBigWazz/Slate"; flake = false; }; slate = { url = "github:TheBigWazz/Slate"; flake = false; };

View File

@@ -1,21 +1,15 @@
{ {
stdenv, lib, src, stdenv, src, wrapGAppsHook3, autoreconfHook, gfortran, gtk3, intltool, gtk-doc, pkg-config, libepoxy, libyaml,
wrapGAppsHook, autoreconfHook, autoconf, libtool, intltool, gettext, automake, gtk-doc, pkg-config, gfortran, libxslt, libxslt, libGLU, wayland, makeWrapper
glib, gtk3, libepoxy, libyaml
}: }:
stdenv.mkDerivation stdenv.mkDerivation
{ {
name = "v-sim"; name = "v-sim";
inherit src; inherit src;
buildInputs = [ glib gtk3 libepoxy libyaml ]; buildInputs = [ gtk3 libepoxy libyaml libGLU ];
nativeBuildInputs = nativeBuildInputs = [ autoreconfHook wrapGAppsHook3 gfortran intltool gtk-doc pkg-config libxslt makeWrapper ];
[
autoreconfHook wrapGAppsHook autoconf libtool intltool gettext automake pkg-config
gtk-doc gfortran libxslt.bin
];
enableParallelBuilding = true; enableParallelBuilding = true;
postPatch = postPatch = "./autogen.sh";
'' dontWrapGApps = true;
./autogen.sh postFixup = ''wrapProgram $out/bin/v_sim "''${gappsWrapperArgs[@]}" --set GDK_BACKEND x11'';
'';
} }