public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65702 from artemist/xonsh-module-fix

Browse Source 
nixos/xonsh: Use the package specified in the package option
This commit is contained in:
Aaron Andersen 2019-07-31 21:42:16 -04:00 committed by GitHub
commit f03639a4c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/programs/xonsh.nix
View File

@ -26,6 +26,7 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.xonsh;
example = literalExample "pkgs.xonsh.override { configFile = \"/path/to/xonshrc\"; }"; example = literalExample "pkgs.xonsh.override { configFile = \"/path/to/xonshrc\"; }";
description = '' description = ''
xonsh package to use. xonsh package to use.
@ -46,11 +47,11 @@ in
environment.etc."xonshrc".text = cfg.config; environment.etc."xonshrc".text = cfg.config;
environment.systemPackages = [ pkgs.xonsh ]; environment.systemPackages = [ cfg.package ];
environment.shells = environment.shells =
[ "/run/current-system/sw/bin/xonsh" [ "/run/current-system/sw/bin/xonsh"
"${pkgs.xonsh}/bin/xonsh" "${cfg.package}/bin/xonsh"
]; ];
}; };