mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-25 20:50:44 -06:00
Compare commits
No commits in common. "506e9abcee9831f46b0d2f86990e948435810295" and "91a720541f436538a1f84532c0326f794dc71e8f" have entirely different histories.
506e9abcee
...
91a720541f
3 changed files with 22 additions and 21 deletions
|
@ -29,6 +29,7 @@
|
|||
# extraPackages = with pkgs; [ libGL ];
|
||||
# setLdLibraryPath = true;
|
||||
# };
|
||||
|
||||
|
||||
# Load nvidia driver for Xorg and Wayland
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
|
|
@ -8,26 +8,30 @@
|
|||
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 = [
|
||||
# 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 =
|
||||
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 "$@"
|
||||
'')
|
||||
|
||||
(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 "$@"
|
||||
'')
|
||||
|
||||
pixi
|
||||
pkgs.micromamba
|
||||
];
|
||||
(python3.withPackages (ps: with ps; [ pip ]))
|
||||
micromamba
|
||||
pixi
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -242,7 +242,7 @@ func Dry(verbose bool, minimal bool, rest ...string) {
|
|||
log.Info("no packages in minimal set to build")
|
||||
os.Exit(0)
|
||||
}
|
||||
cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
|
||||
cmd.Args = append(cmd.Args, drvs...)
|
||||
spinnerMsg = "evaluting for minimal build needs"
|
||||
} else {
|
||||
log.Debug("evalutating full nixosConfiguration")
|
||||
|
@ -318,10 +318,6 @@ var ignoredMap = stringSliceToMap(
|
|||
"nixos-rebuild",
|
||||
"nixos-help",
|
||||
"nixos-generate-config",
|
||||
"nixos-enter",
|
||||
"nixos-container",
|
||||
"nixos-build-vms",
|
||||
"ld-library-path",
|
||||
|
||||
"nixos-wsl-version",
|
||||
"nixos-wsl-welcome-message",
|
||||
|
|
Loading…
Reference in a new issue