aboutsummaryrefslogtreecommitdiffhomepage
path: root/sundry
diff options
context:
space:
mode:
Diffstat (limited to 'sundry')
-rw-r--r--sundry/spine_search_cgi/.envrc4
-rw-r--r--sundry/spine_search_cgi/derivation.nix9
-rwxr-xr-xsundry/spine_search_cgi/shell.nix17
3 files changed, 22 insertions, 8 deletions
diff --git a/sundry/spine_search_cgi/.envrc b/sundry/spine_search_cgi/.envrc
index 72eefc7..c0adda9 100644
--- a/sundry/spine_search_cgi/.envrc
+++ b/sundry/spine_search_cgi/.envrc
@@ -3,6 +3,6 @@ if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
# https://github.com/nix-community/nix-direnv
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
fi
-if [ -e .env/local ]; then # source an additional user-specific .envrc in ./.env/local
- source .env/local
+if [ -e .env/local ]; then
+ source_env_if_exists .env/local || source .env/local
fi
diff --git a/sundry/spine_search_cgi/derivation.nix b/sundry/spine_search_cgi/derivation.nix
index 5bde866..596957e 100644
--- a/sundry/spine_search_cgi/derivation.nix
+++ b/sundry/spine_search_cgi/derivation.nix
@@ -91,9 +91,16 @@ mkDubDerivation rec {
pkgs.sqlite (
with pkgs; [
nixFlakes
- rund
+ ## package manager
dub
+ ## compiler
ldc
+ rund
+ ## linker
+ #lld
+ #mold
+ ## builder
+ #ninja
sqlite
]
)
diff --git a/sundry/spine_search_cgi/shell.nix b/sundry/spine_search_cgi/shell.nix
index 8a73316..7ee5672 100755
--- a/sundry/spine_search_cgi/shell.nix
+++ b/sundry/spine_search_cgi/shell.nix
@@ -3,20 +3,27 @@
with pkgs;
mkShell {
buildInputs = [
- # nix_related
+ ### nix_related
nixFlakes
nix-prefetch-git
validatePkgConfig
jq
git
- # d_build_related
- rund
+ ### d_build_related
+ ## package manager
dub
+ ## compiler
ldc
+ rund
+ ## linker
+ #lld
+ #mold
+ ## builder
+ #ninja
#meson
- # search related
+ ### sqlite search related
sqlite
- # candy
+ ### candy
starship
];
shellHook = ''