mirror of
https://github.com/ivabus/nixos
synced 2024-11-10 02:25:18 +03:00
Move python3full to base.nix to fix some things
Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
This commit is contained in:
parent
9a5e3dbda2
commit
4146f35a5b
|
@ -24,15 +24,14 @@ in {
|
|||
man.enable = true;
|
||||
};
|
||||
|
||||
# mkDefaulting due to python3Minimal and python3Full collision
|
||||
environment.systemPackages = lib.mkDefault (with pkgs;
|
||||
[ wget curl git git-crypt neovim python3Minimal ]
|
||||
environment.systemPackages = with pkgs;
|
||||
[ wget curl git git-crypt neovim python3Full ]
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
usbutils
|
||||
pciutils
|
||||
coreutils
|
||||
killall
|
||||
]);
|
||||
];
|
||||
# Inject secrets through module arguments while evaluating configs.
|
||||
_module.args.secrets = secrets;
|
||||
}
|
||||
|
|
|
@ -14,7 +14,6 @@ in {
|
|||
clang
|
||||
llvm
|
||||
lld
|
||||
python3Full
|
||||
gnumake
|
||||
automake
|
||||
autoconf
|
||||
|
@ -36,9 +35,6 @@ in {
|
|||
(lib.mkIf (!pkgs.stdenv.isx86_64) {
|
||||
boot.binfmt.emulatedSystems = [ "x86_64-linux" "i686-linux" ];
|
||||
})
|
||||
(lib.mkIf (builtins.currentSystem != "riscv64-linux") {
|
||||
boot.binfmt.emulatedSystems = [ "riscv64-linux" ];
|
||||
})
|
||||
|
||||
/* # Install CLion only if we are on x86_64
|
||||
(lib.mkIf (pkgs.stdenv.isx86_64) {
|
||||
|
|
Loading…
Reference in a new issue