From 15e742c8c24b00f40977b2d730cd109faecabbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 2 Aug 2025 13:52:35 +0200 Subject: [PATCH] Fixup static libraries in development server --- .gitignore | 2 ++ README.md | 2 ++ src/meson.build | 16 ++++------------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index bf385fa3..ea9c2985 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ /.direnv/ .test_info.* /src/root/static/bootstrap +/src/root/static/fontawesome +/src/root/static/js/flot /src/sql/hydra-postgresql.sql /src/sql/hydra-sqlite.sql /src/sql/tmp.sqlite diff --git a/README.md b/README.md index 52faffbd..7c20f9bf 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,8 @@ You can use the provided shell.nix to get a working development environment: ``` $ nix develop $ ln -svf ../../../build/src/bootstrap src/root/static/bootstrap +$ ln -svf ../../../build/src/fontawesome src/root/static/fontawesome +$ ln -svf ../../../../build/src/flot src/root/static/js/flot $ meson setup build $ ninja -C build ``` diff --git a/src/meson.build b/src/meson.build index 52b821bc..c2ffc075 100644 --- a/src/meson.build +++ b/src/meson.build @@ -57,20 +57,12 @@ fontawesome = custom_target( command: ['unzip', '-u', '-d', '@OUTDIR@', '@INPUT@'], ) custom_target( - 'name-fontawesome-css', + 'name-fontawesome', input: fontawesome, - output: 'css', - command: ['cp', '-r', '@INPUT@/css', '@OUTPUT@'], + output: 'fontawesome', + command: ['cp', '-r', '@INPUT@' , '@OUTPUT@'], install: true, - install_dir: hydra_libexecdir_static / 'fontawesome', -) -custom_target( - 'name-fontawesome-webfonts', - input: fontawesome, - output: 'webfonts', - command: ['cp', '-r', '@INPUT@/webfonts', '@OUTPUT@'], - install: true, - install_dir: hydra_libexecdir_static / 'fontawesome', + install_dir: hydra_libexecdir_static, ) # Scripts