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

Compare commits

base: daylin:506e9abcee9831f46b0d2f86990e948435810295
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:91a720541f436538a1f84532c0326f794dc71e8f
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "506e9abcee9831f46b0d2f86990e948435810295" and "91a720541f436538a1f84532c0326f794dc71e8f" have entirely different histories.
506e9abcee ... 91a720541f

3 changed files with 22 additions and 21 deletions
Show stats Expand all files Collapse all files

1
hosts/mannaz/system.nix
View file

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

6
pkgs/oizys/oizys-go/internal/oizys/main.go
View file

@ -242,7 +242,7 @@ func Dry(verbose bool, minimal bool, rest ...string) {
log.Info("no packages in minimal set to build") log.Info("no packages in minimal set to build")
os.Exit(0) os.Exit(0)
} }
cmd.Args = append(cmd.Args, append(drvs, "--no-link")...) cmd.Args = append(cmd.Args, drvs...)
spinnerMsg = "evaluting for minimal build needs" spinnerMsg = "evaluting for minimal build needs"
} else { } else {
log.Debug("evalutating full nixosConfiguration") log.Debug("evalutating full nixosConfiguration")
@ -318,10 +318,6 @@ var ignoredMap = stringSliceToMap(
"nixos-rebuild", "nixos-rebuild",
"nixos-help", "nixos-help",
"nixos-generate-config", "nixos-generate-config",
"nixos-enter",
"nixos-container",
"nixos-build-vms",
"ld-library-path",
"nixos-wsl-version", "nixos-wsl-version",
"nixos-wsl-welcome-message", "nixos-wsl-welcome-message",