aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2023-06-20 15:17:05 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2023-06-20 15:17:17 -0400
commit766b90447126551c3f4956d12944555aef5b3f27 (patch)
treebbcdeda29f6bcb349ff2d85354bd94e3b2e336e7
parentcosmetic, use of ❮ ❯ & ፨ unicode chars (diff)
flake.nix offer build bypass of ldc overlay
-rw-r--r--flake.nix25
-rw-r--r--org/config_nix.org25
2 files changed, 44 insertions, 6 deletions
diff --git a/flake.nix b/flake.nix
index 8fe746e..fb13f2a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-dmd = stdenv.mkDerivation {
+ spine-search-ovl-dmd = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-dmd";
@@ -96,7 +96,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-ldc = stdenv.mkDerivation {
+ spine-search-ovl-ldc = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-ldc";
@@ -115,7 +115,26 @@
inherit installPhase;
inherit postInstall;
};
- #spine-search-gdc = stdenv.mkDerivation {
+ spine-search-nixpkgs-ldc = stdenv.mkDerivation {
+ inherit pname;
+ inherit version;
+ meta.mainProgram = "spine_search-ldc";
+ executable = true;
+ src = self;
+ inherit shell;
+ inherit devEnv;
+ buildInputs = with pkgs; [sqlite];
+ nativeBuildInputs = with pkgs; [dub ldc gnumake];
+ buildPhase = ''
+ runHook preBuild
+ dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
+ runHook postBuild
+ '';
+ inherit checkPhase;
+ inherit installPhase;
+ inherit postInstall;
+ };
+ #spine-search-ovl-gdc = stdenv.mkDerivation {
# inherit pname;
# inherit version;
# meta.mainProgram = "spine_search-gdc";
diff --git a/org/config_nix.org b/org/config_nix.org
index 12c1c68..17427cf 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -100,7 +100,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-dmd = stdenv.mkDerivation {
+ spine-search-ovl-dmd = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-dmd";
@@ -119,7 +119,7 @@
inherit installPhase;
inherit postInstall;
};
- spine-search-ldc = stdenv.mkDerivation {
+ spine-search-ovl-ldc = stdenv.mkDerivation {
inherit pname;
inherit version;
meta.mainProgram = "spine_search-ldc";
@@ -138,7 +138,26 @@
inherit installPhase;
inherit postInstall;
};
- #spine-search-gdc = stdenv.mkDerivation {
+ spine-search-nixpkgs-ldc = stdenv.mkDerivation {
+ inherit pname;
+ inherit version;
+ meta.mainProgram = "spine_search-ldc";
+ executable = true;
+ src = self;
+ inherit shell;
+ inherit devEnv;
+ buildInputs = with pkgs; [sqlite];
+ nativeBuildInputs = with pkgs; [dub ldc gnumake];
+ buildPhase = ''
+ runHook preBuild
+ dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
+ runHook postBuild
+ '';
+ inherit checkPhase;
+ inherit installPhase;
+ inherit postInstall;
+ };
+ #spine-search-ovl-gdc = stdenv.mkDerivation {
# inherit pname;
# inherit version;
# meta.mainProgram = "spine_search-gdc";