Skip to content

feat: add system-manager.package option #520

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
jbgi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add system-manager.package option #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions nix/lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,7 @@ let
shell;
};
# Pass the wrapped system-manager binary down
# TODO: Use nixpkgs version by default.
system-manager = pkgs.callPackage ./packages/wrapper.nix {
system-manager-unwrapped = pkgs.callPackage ../package.nix { };
};
system-manager = config.system-manager.package;
userborn = userborn.packages.${config.nixpkgs.hostPlatform}.default;
};
};
Expand Down Expand Up @@ -118,10 +115,8 @@ let
inherit (eval) config options;
inherit (config.nixpkgs) pkgs;

# Build system-manager package for use in toplevel
system-manager = pkgs.callPackage ./packages/wrapper.nix {
system-manager-unwrapped = pkgs.callPackage ../package.nix { };
};
# Retrieve system-manager package for use in toplevel
system-manager = config.system-manager.package;

returnIfNoAssertions =
drv:
Expand Down
15 changes: 15 additions & 0 deletions nix/modules/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,21 @@
};

system-manager = {
package = lib.mkOption {
type = lib.types.package;
# TODO: Use nixpkgs version by default.
default = pkgs.callPackage ../packages/wrapper.nix {
system-manager-unwrapped = pkgs.callPackage ../../package.nix { };
};
example = "pkgs.system-manager";
defaultText = lib.literalExpression ''
pkgs.callPackage ''${system-manager}/nix/modules/packages/wrapper.nix {
system-manager-unwrapped = pkgs.callPackage ''${system-manager}/package.nix { };
}
'';
description = "System-manager binary to use.";
};

allowAnyDistro = lib.mkEnableOption "the usage of system-manager on untested distributions";

linkCurrentSystem = lib.mkOption {
Expand Down