diff options
Diffstat (limited to 'org/config_nix.org')
| -rw-r--r-- | org/config_nix.org | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/org/config_nix.org b/org/config_nix.org index b9a61a2..0b27d4e 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -45,8 +45,8 @@ d-overlay, } @ inputs: let version = "<<spine_version_set>>"; - shell = ./shell.nix; # ./default.nix; - devEnv = ./.envrc; # ./shell.nix; # ./default.nix; + shell = ./shell.nix; + devEnv = ./nixDevEnv.sh; supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types @@ -55,11 +55,10 @@ pkgs = nixpkgsFor.${system}; in { default = spine.packages.${system}.default; - spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc; + spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd; + spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd; spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc; - #spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd; - #spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc; - #spine-overlay-gdc = spine.packages.${system}.spine-overlay-gdc; + spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc; #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000="; }); apps = forAllSystems (system: { @@ -81,8 +80,6 @@ name = "spine base dev shell"; inherit shell; inherit devEnv; - #buildInputs = [ sqlite ]; - #nativeBuildInputs = [ dub dmd ldc gdc gnumake ]; packages = [ ldc #dmd @@ -117,6 +114,7 @@ epr sigil calibre #(suite includes: ebook-viewer) + koreader foliate ]; inherit shellHook; @@ -143,7 +141,6 @@ #dmd dub gnumake - sqlite source-sans-pro source-serif-pro source-code-pro @@ -237,6 +234,7 @@ with pkgs; # epr # sigil # calibre #(suite includes: ebook-viewer) + # koreader # foliate # ❯❯❯ i18n translation related # perl538Packages.Po4a @@ -459,7 +457,7 @@ with ( #+NAME: spine_version_set #+BEGIN_SRC sh -0.12.0 +0.14.0 #+END_SRC #+NAME: project_path_local_out_static @@ -818,4 +816,3 @@ ls $SpineOutstatic/latex/*.tex #echo "emacs nixNote_.org" #echo "cat nixNote_.org" #+END_SRC - |