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

Compare commits

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

3 commits
91a720541f ... 506e9abcee

Author SHA1 Message Date
Daylin Morgan
506e9abcee
refactor python module 2024-06-25 11:39:41 -05:00
Daylin Morgan
cb6c14f81e
add more 'ignored' packages 2024-06-25 11:26:10 -05:00
Daylin Morgan
1ca5f9688a
don't symlink when using multiple "installables" 2024-06-25 11:06:30 -05:00
3 changed files with 21 additions and 22 deletions
Show stats Expand all files Collapse all files

1
hosts/mannaz/system.nix
View file

@ -30,7 +30,6 @@
# 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 ];
];
}; };
} }

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, drvs...) cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
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,6 +318,10 @@ 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",