forked from Shinonome/alt-illogical-impulse
Fix circular dependency - define setupVenvScript before venvDerivation
This commit is contained in:
@@ -8,17 +8,6 @@ let
|
|||||||
cfg = config.programs.dots-hyprland.python;
|
cfg = config.programs.dots-hyprland.python;
|
||||||
mainCfg = config.programs.dots-hyprland;
|
mainCfg = config.programs.dots-hyprland;
|
||||||
|
|
||||||
# Build Python venv as a derivation (happens during build, not activation)
|
|
||||||
venvDerivation = pkgs.runCommand "dots-hyprland-venv" {
|
|
||||||
buildInputs = [ pkgs.python312 ];
|
|
||||||
nativeBuildInputs = with pkgs; [ cmake pkg-config gcc gnumake wayland wayland-protocols ];
|
|
||||||
} ''
|
|
||||||
export HOME=$TMPDIR
|
|
||||||
mkdir -p $out
|
|
||||||
${setupVenvScript}
|
|
||||||
mv $HOME/.local/state/quickshell/.venv $out/venv
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Virtual environment setup script that replicates installer behavior
|
# Virtual environment setup script that replicates installer behavior
|
||||||
setupVenvScript = pkgs.writeShellScript "setup-dots-hyprland-venv" ''
|
setupVenvScript = pkgs.writeShellScript "setup-dots-hyprland-venv" ''
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
@@ -172,6 +161,17 @@ else:
|
|||||||
|
|
||||||
echo "🎉 Python environment test complete!"
|
echo "🎉 Python environment test complete!"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Build Python venv as a derivation (happens during build, not activation)
|
||||||
|
venvDerivation = pkgs.runCommand "dots-hyprland-venv" {
|
||||||
|
buildInputs = [ pkgs.python312 ];
|
||||||
|
nativeBuildInputs = with pkgs; [ cmake pkg-config gcc gnumake wayland wayland-protocols ];
|
||||||
|
} ''
|
||||||
|
export HOME=$TMPDIR
|
||||||
|
mkdir -p $out
|
||||||
|
${setupVenvScript}
|
||||||
|
mv $HOME/.local/state/quickshell/.venv $out/venv
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.programs.dots-hyprland.python = {
|
options.programs.dots-hyprland.python = {
|
||||||
|
|||||||
Reference in New Issue
Block a user