js, wip net native aot

This commit is contained in:
Vinzenz Schroeter 2024-03-09 17:56:02 +01:00
parent d428940299
commit 99f553a4c6
4 changed files with 60 additions and 14 deletions

View file

@ -5,6 +5,9 @@
... ...
}: let }: let
cfg = config.my.buildtools; cfg = config.my.buildtools;
dotnetPackage = with pkgs; (dotnetCorePackages.combinePackages [
dotnet-sdk_8
]);
in { in {
options.my.buildtools = { options.my.buildtools = {
native = lib.mkEnableOption "include native build tools"; native = lib.mkEnableOption "include native build tools";
@ -12,6 +15,7 @@ in {
rust = lib.mkEnableOption "include rust build tools"; rust = lib.mkEnableOption "include rust build tools";
jetbrains-remote-server = lib.mkEnableOption "setup jetbrais IDE installs so -remote-dev-server can be started"; jetbrains-remote-server = lib.mkEnableOption "setup jetbrais IDE installs so -remote-dev-server can be started";
objective-c = lib.mkEnableOption "Objective-C with GNUStep"; objective-c = lib.mkEnableOption "Objective-C with GNUStep";
js = lib.mkEnableOption "node stuff";
}; };
config = lib.mkMerge [ config = lib.mkMerge [
@ -22,24 +26,43 @@ in {
gnumake gnumake
gcc gcc
gdb gdb
llvmPackages_latest.llvm llvmPackages.llvm
llvmPackages.clangUseLLVM llvmPackages.clangUseLLVM
]; ];
}) })
(lib.mkIf cfg.dotnet { (lib.mkIf cfg.dotnet {
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
dotnet-sdk_8 unstable.jetbrains.jdk
unstable.jetbrains.rider
dotnetPackage
zlib zlib
zlib.dev zlib.dev
openssl openssl
icu icu
icu.dev
# native aot
gcc
libunwind
]; ];
variables = { variables = {
DOTNET_CLI_TELEMETRY_OPTOUT = "1"; DOTNET_CLI_TELEMETRY_OPTOUT = "1";
}; };
}; };
programs.nix-ld.libraries = with pkgs; [
# native aot
libunwind
icu
zlib
zlib.dev
openssl
icu
icu.dev
dotnetPackage
];
}) })
(lib.mkIf cfg.rust { (lib.mkIf cfg.rust {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -82,5 +105,10 @@ in {
gnumake gnumake
]); ]);
}) })
(lib.mkIf cfg.js {
environment.systemPackages = with pkgs; [
nodejs
];
})
]; ];
} }

View file

@ -53,6 +53,25 @@ in {
enable = true; enable = true;
languagePacks = ["en-US" "de"]; languagePacks = ["en-US" "de"];
}; };
nix-ld = {
enable = true;
libraries = with pkgs; [
stdenv.cc.cc
zlib
zstd
curl
openssl
attr
libssh
bzip2
libxml2
acl
libsodium
util-linux
xz
systemd
];
};
}; };
networking = { networking = {
@ -86,8 +105,7 @@ in {
''; '';
}; };
environment = { environment.systemPackages = with pkgs; [
systemPackages = with pkgs; [
lm_sensors lm_sensors
# office # office
@ -96,7 +114,6 @@ in {
hunspellDicts.de-de hunspellDicts.de-de
hunspellDicts.en-us-large hunspellDicts.en-us-large
]; ];
};
nixpkgs.config.permittedInsecurePackages = []; nixpkgs.config.permittedInsecurePackages = [];

View file

@ -3,8 +3,8 @@
lib, lib,
... ...
}: let }: let
unstable-commit-sha = "e92b6015881907e698782c77641aa49298330223"; unstable-commit-sha = "9df3e30ce24fd28c7b3e2de0d986769db5d6225d";
ultrastable-commit-sha = "5de0b32be6e85dc1a9404c75131316e4ffbc634c"; ultrastable-commit-sha = "2be119add7b37dc535da2dd4cba68e2cf8d1517e";
in { in {
options.my.allowUnfreePackages = lib.mkOption { options.my.allowUnfreePackages = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;

View file

@ -18,6 +18,7 @@
buildtools = { buildtools = {
dotnet = true; dotnet = true;
#objective-c = true; #objective-c = true;
js = true;
}; };
allowUnfreePackages = [ allowUnfreePackages = [