Skip to content

lib.nix: pick userborn using correct system attr #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mjones-vsat wants to merge 3 commits into
base: main
Choose a base branch
from
Open

lib.nix: pick userborn using correct system attr #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6bcf5d
lib.nix: pick userborn using correct system attr
mjones-vsat Jul 20, 2026
94bf5ea
modules/default: make userborn optional in deactivate script
mjones-vsat Jul 20, 2026
71f71f7
lib.nix/modules: clean up missing system conditionals and types
mjones-vsat Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions nix/lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ let
Set `allowUnsupportedNixpkgs = true;` in `makeSystemConfig` to bypass this check.
'';

# Returns the system string from a nixpkgs.
getSystem = cfg: if cfg.hostPlatform ? system then cfg.hostPlatform.system else cfg.hostPlatform;

self = {
# Function that can be used when defining inline modules to get better location
# reporting in module-system errors.
Expand Down Expand Up @@ -73,7 +76,7 @@ let
}
else
{
system = cfg.hostPlatform;
system = getSystem cfg.hostPlatform;
};
in
import nixpkgs (
Expand Down Expand Up @@ -106,7 +109,7 @@ let
system-manager = pkgs.callPackage ./packages/wrapper.nix {
system-manager-unwrapped = pkgs.callPackage ../package.nix { };
};
userborn = userborn.packages.${config.nixpkgs.hostPlatform}.default;
userborn = userborn.packages.${getSystem config.nixpkgs}.default;
};
};

Expand Down
7 changes: 5 additions & 2 deletions nix/modules/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
{
nixpkgs = {
buildPlatform = lib.mkOption {
type = types.str;
type = with types; either str attrs;
example = "x86_64-linux";
default = config.nixpkgs.hostPlatform;
description = "The platform on which we are building the system configuration.";
};

hostPlatform = lib.mkOption {
Expand Down Expand Up @@ -265,7 +266,9 @@
'';

deactivationScript = pkgs.writeShellScript "deactivate" ''
export PATH="$PATH:${lib.makeBinPath [ config.services.userborn.package ]}"
export PATH="$PATH:${
lib.makeBinPath (lib.optionals config.services.userborn.enable [ config.services.userborn.package ])
}"
${system-manager}/bin/system-manager-engine deactivate "$@"
'';

Expand Down