mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-11-05 01:53:15 -06:00
refactor python module
This commit is contained in:
parent
cb6c14f81e
commit
506e9abcee
2 changed files with 16 additions and 21 deletions
|
@ -29,7 +29,6 @@
|
|||
# extraPackages = with pkgs; [ libGL ];
|
||||
# setLdLibraryPath = true;
|
||||
# };
|
||||
|
||||
|
||||
# Load nvidia driver for Xorg and Wayland
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
|
|
@ -8,30 +8,26 @@
|
|||
let
|
||||
inherit (lib) mkIfIn;
|
||||
cfg = config.oizys.languages;
|
||||
|
||||
python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
|
||||
pixi = inputs.pixi.packages.${pkgs.system}.default;
|
||||
in
|
||||
{
|
||||
config = mkIfIn "python" cfg {
|
||||
environment.systemPackages =
|
||||
let
|
||||
python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
|
||||
pixi = inputs.pixi.packages.${pkgs.system}.default;
|
||||
in
|
||||
with pkgs;
|
||||
[
|
||||
# https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld
|
||||
(pkgs.writeShellScriptBin "python" ''
|
||||
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
|
||||
exec ${python}/bin/python "$@"
|
||||
'')
|
||||
environment.systemPackages = [
|
||||
# https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld
|
||||
(pkgs.writeShellScriptBin "python" ''
|
||||
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
|
||||
exec ${python}/bin/python "$@"
|
||||
'')
|
||||
|
||||
(pkgs.writeShellScriptBin "python3" ''
|
||||
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
|
||||
exec ${python}/bin/python "$@"
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "python3" ''
|
||||
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
|
||||
exec ${python}/bin/python "$@"
|
||||
'')
|
||||
|
||||
(python3.withPackages (ps: with ps; [ pip ]))
|
||||
micromamba
|
||||
pixi
|
||||
];
|
||||
pixi
|
||||
pkgs.micromamba
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue