From 5e8679d47be998a1e9ca8928ca96121fc44701e3 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 3 Dec 2024 18:05:52 -0500
Subject: nix build flake.nix fix
---
org/config_nix.org | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'org/config_nix.org')
diff --git a/org/config_nix.org b/org/config_nix.org
index 351e696..60d92ee 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -25,7 +25,7 @@
description = "a sisu like document parser search form";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
- inputs.d-overlay = {
+ inputs.spine-d-overlay = {
url = "<<sisudoc_dlang_nix_overlay_src>>";
inputs.nixpkgs.follows = "nixpkgs";
flake = true;
@@ -34,7 +34,7 @@
self,
nixpkgs,
flake-utils,
- d-overlay,
+ spine-d-overlay,
...
}@inputs: let
pname = "spine_search";
@@ -116,8 +116,8 @@
src = self;
inherit shell;
inherit devEnv;
- buildInputs = [sqlite];
- nativeBuildInputs = [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"
@@ -139,8 +139,8 @@
src = self;
inherit shell;
inherit devEnv;
- buildInputs = [sqlite];
- nativeBuildInputs = [dub ldc gnumake];
+ buildInputs = with pkgs-nix; [sqlite];
+ 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"
@@ -231,7 +231,7 @@
'';
in
with pkgs-nix; {
- dsh-d-overlay = d-overlay.devShells.${system}.default;
+ dsh-d-overlay = spine-d-overlay.devShells.${system}.default;
dsh-overlay = mkShell {
name = "spine base dev shell";
inherit shell;
--
cgit v1.2.3