diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/config_dub.org | 20 | ||||
| -rw-r--r-- | org/config_nix.org | 20 |
2 files changed, 18 insertions, 22 deletions
diff --git a/org/config_dub.org b/org/config_dub.org index 6f107fa..cab6c2b 100644 --- a/org/config_dub.org +++ b/org/config_dub.org @@ -65,7 +65,7 @@ "buildTypes": { "dmd": { "dflags": [ "-J=views", "-I=src/doc_reform" ], - "buildOptions": [ "inline", "verbose" ], + "buildOptions": [ "inline", "verbose" ], "buildRequirements": [ "allowWarnings" ] }, "ldc2": { @@ -75,7 +75,7 @@ }, "ldmd2": { "dflags": [ "-O2", "-boundscheck=on", "-J=views", "-I=src/doc_reform", "-color=on" ], - "buildOptions": [ "optimize", "inline", "verbose" ], + "buildOptions": [ "optimize", "inline", "verbose" ], "buildRequirements": [ "allowWarnings" ] }, "gdc": { @@ -96,14 +96,14 @@ }, "subPackages": [ { - "name": "d2sqlite3", - "description": "A thin wrapper around SQLite 3", - "homepage": "https://github.com/dlang-community/d2sqlite3", - "authors": [ "Nicolas Sicard", "Other contributors: see Github repo" ], - "copyright": "Copyright 2011-18 Nicolas Sicard", - "license": "BSL-1.0", - "sourcePaths": [ "./src/ext_depends/d2sqlite3/source" ], - "importPaths": [ "./src/ext_depends/d2sqlite3/source" ], + "name": "d2sqlite3", + "description": "A thin wrapper around SQLite 3", + "homepage": "https://github.com/dlang-community/d2sqlite3", + "authors": [ "Nicolas Sicard", "Other contributors: see Github repo" ], + "copyright": "Copyright 2011-18 Nicolas Sicard", + "license": "BSL-1.0", + "sourcePaths": [ "./src/ext_depends/d2sqlite3/source" ], + "importPaths": [ "./src/ext_depends/d2sqlite3/source" ], "configurations": [ { "name": "d2sqlite3", diff --git a/org/config_nix.org b/org/config_nix.org index 2ef18e5..8e2a830 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -54,6 +54,9 @@ ]; inherit system; }; + preBuild = '' + export HOME=$(pwd) + ''; installPhase = '' runHook preInstall mkdir -p $out/bin @@ -80,9 +83,6 @@ inherit devEnv; buildInputs = [sqlite]; nativeBuildInputs = [dub ldc gnumake]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ]; - preBuild = '' - export HOME=$(pwd) - ''; buildPhase = '' runHook preBuild for DC_ in dmd ldmd2 ldc2 gdc gdmd; do @@ -95,6 +95,7 @@ dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all runHook postBuild ''; + inherit preBuild; inherit checkPhase; inherit installPhase; inherit postInstall; @@ -109,14 +110,12 @@ inherit devEnv; buildInputs = [sqlite]; nativeBuildInputs = [dub dmd gnumake]; - preBuild = '' - export HOME=$(pwd) - ''; buildPhase = '' runHook preBuild dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all runHook postBuild ''; + inherit preBuild; inherit checkPhase; inherit installPhase; inherit postInstall; @@ -131,14 +130,12 @@ inherit devEnv; buildInputs = [sqlite]; nativeBuildInputs = [dub ldc gnumake]; - preBuild = '' - export HOME=$(pwd) - ''; buildPhase = '' runHook preBuild dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all runHook postBuild ''; + inherit preBuild; inherit checkPhase; inherit installPhase; inherit postInstall; @@ -153,14 +150,12 @@ inherit devEnv; buildInputs = with pkgs; [sqlite]; nativeBuildInputs = with pkgs; [dub ldc gnumake]; - preBuild = '' - export HOME=$(pwd) - ''; buildPhase = '' runHook preBuild dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all runHook postBuild ''; + inherit preBuild; inherit checkPhase; inherit installPhase; inherit postInstall; @@ -180,6 +175,7 @@ # dub build --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all # runHook postBuild # ''; + # inherit preBuild; # inherit checkPhase; # inherit installPhase; # inherit postInstall; |