From 03ab3dbfde3a65dfa17a81b5506cc61e11c2d61d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 3 Dec 2024 17:58:47 -0500 Subject: nix build flake.nix fix --- org/config_nix.org | 6 +++--- org/nixpkgs_overlays_d_related.org | 10 ++++++++++ org/spine_info.org | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'org') diff --git a/org/config_nix.org b/org/config_nix.org index fc31bd8..eced79d 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -112,8 +112,8 @@ src = self; inherit shell; inherit devEnv; - buildInputs = with pkgs-ovl; [sqlite]; - nativeBuildInputs = with pkgs-ovl; [dub dmd gnumake]; + buildInputs = with pkgs-nix; [sqlite]; + nativeBuildInputs = with pkgs-nix; [dub dmd gnumake]; buildPhase = '' runHook preBuild buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all" @@ -136,7 +136,7 @@ inherit shell; inherit devEnv; buildInputs = with pkgs-nix; [sqlite]; - nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake]; + nativeBuildInputs = with pkgs-nix; [dub ldc gnumake]; buildPhase = '' runHook preBuild buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all" diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index 0190383..7abaa20 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -25,6 +25,16 @@ - https://github.com/dlang/dub/releases - https://github.com/dlang/tools/tags +- dependencies sisudoc-spine + - https://github.com/dlang-community/d2sqlite3/releases + - https://github.com/dlang-community/D-YAML + - https://github.com/tjhann/imageformats/tags + - https://github.com/dlang-community/tinyendian/releases + +- dependencies sisudoc-spine-search-cgi + - https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d + - https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d + ** README #+HEADER: :tangle "../nix-overlays/README" diff --git a/org/spine_info.org b/org/spine_info.org index a5ab360..f5013a7 100644 --- a/org/spine_info.org +++ b/org/spine_info.org @@ -1140,6 +1140,7 @@ webserv: - code: cgi.d aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d + aria2c https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d - License: BSL-1.0 Boost Software License 1.0 -- cgit v1.2.3