Template : Format.

This commit is contained in:
Dmitry Voronin 2024-02-26 01:25:26 +03:00
parent 0d10ed219e
commit 5f4ee580e9
4 changed files with 10 additions and 68 deletions

View file

@ -1,12 +1,11 @@
{ {
description = "FMP Android dev environment."; description = "Android dev environment.";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs } @inputs: outputs = { self, nixpkgs } @inputs: let
let
system = "x86_64-linux"; system = "x86_64-linux";
lib = nixpkgs.lib; lib = nixpkgs.lib;
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -38,43 +37,9 @@
# systemImageTypes = [ "google_apis_playstore" ]; # systemImageTypes = [ "google_apis_playstore" ];
}; };
androidSdk = androidComposition.androidsdk; androidSdk = androidComposition.androidsdk;
tex = (pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-basic
amsmath
babel
capt-of
catchfile
collection-fontsextra
cyrillic
dvipng
dvisvgm
environ
etoolbox
fancyhdr
fontspec
geometry
hyperref
luacode
luatexbase
montserrat
parskip
pgf
tcolorbox
tocloft
ulem
wrapfig
xcolor;
#(setq org-latex-compiler "lualatex")
#(setq org-preview-latex-default-process 'dvisvgm)
});
in { in {
devShells.${system} = { devShells.${system} = {
default = pkgs.mkShell { default = pkgs.mkShell rec {
inputsFrom = with self.devShells.${system}; [ dev doc ];
};
dev = pkgs.mkShell rec {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
android-tools android-tools
androidSdk androidSdk
@ -89,17 +54,6 @@
LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}"; LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk/"; ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk/";
}; };
doc = pkgs.mkShell rec {
nativeBuildInputs = with pkgs; [
gnumake
jdk
tex
];
buildInputs = with pkgs; [];
JAVA_HOME = "${jdk}";
};
}; };
}; };
} }

View file

@ -5,24 +5,15 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs } @inputs: outputs = { self, nixpkgs } @inputs: let
let
system = "x86_64-linux"; system = "x86_64-linux";
lib = nixpkgs.lib; lib = nixpkgs.lib;
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in { in {
devShells.${system} = { devShells.${system} = {
default = pkgs.mkShell { default = pkgs.mkShell rec {
inputsFrom = with self.devShells.${system}; [ nativeBuildInputs = with pkgs; [ ];
custom buildInputs = with pkgs; [ ];
];
};
custom = pkgs.mkShell rec {
nativeBuildInputs = with pkgs; [
];
buildInputs = with pkgs; [
];
}; };
}; };
}; };

View file

@ -5,8 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs } @inputs: outputs = { self, nixpkgs } @inputs: let
let
system = "x86_64-linux"; system = "x86_64-linux";
lib = nixpkgs.lib; lib = nixpkgs.lib;
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -45,7 +44,6 @@
devShells.${system} = { devShells.${system} = {
default = pkgs.mkShell rec { default = pkgs.mkShell rec {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
gnumake
tex tex
]; ];
buildInputs = with pkgs; [ ]; buildInputs = with pkgs; [ ];

View file

@ -5,8 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs } @inputs: outputs = { self, nixpkgs } @inputs: let
let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
lib = nixpkgs.lib; lib = nixpkgs.lib;