diff options
| -rw-r--r-- | flake.nix | 25 | ||||
| -rw-r--r-- | org/config_nix.org | 25 | 
2 files changed, 44 insertions, 6 deletions
| @@ -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"; | 
