daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-22 10:10:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

refactor python module

Browse source
This commit is contained in:
Daylin Morgan 2024-06-25 11:39:41 -05:00
parent cb6c14f81e
commit 506e9abcee
Signed by: daylin
GPG key ID: 950D13E9719334AD
2 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/mannaz/system.nix
View file

@ -29,7 +29,6 @@
# extraPackages = with pkgs; [ libGL ]; # extraPackages = with pkgs; [ libGL ];
# setLdLibraryPath = true; # setLdLibraryPath = true;
# }; # };
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];

36
modules/languages/python.nix
View file

@ -8,30 +8,26 @@
let let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
pixi = inputs.pixi.packages.${pkgs.system}.default;
in in
{ {
config = mkIfIn "python" cfg { config = mkIfIn "python" cfg {
environment.systemPackages = environment.systemPackages = [
let # https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld
python = pkgs.python3.withPackages (ps: with ps; [ pip ]); (pkgs.writeShellScriptBin "python" ''
pixi = inputs.pixi.packages.${pkgs.system}.default; export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
in exec ${python}/bin/python "$@"
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 "$@"
'')
(pkgs.writeShellScriptBin "python3" '' (pkgs.writeShellScriptBin "python3" ''
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
exec ${python}/bin/python "$@" exec ${python}/bin/python "$@"
'') '')
(python3.withPackages (ps: with ps; [ pip ])) pixi
micromamba pkgs.micromamba
pixi ];
];
}; };
} }