mirror of
https://github.com/nix-community/nix-on-droid.git
synced 2025-11-08 19:46:07 +01:00
Increase priority value to avoid conflict
When enabling useUserPackages, there is a conflict of duplicate package installations.
This commit is contained in:
parent
a1c91e7753
commit
d848df3a33
2 changed files with 14 additions and 3 deletions
|
|
@ -17,6 +17,7 @@ let
|
|||
pkgs.coreutils
|
||||
pkgs.diffutils
|
||||
pkgs.findutils
|
||||
pkgs.gnugrep
|
||||
pkgs.gnused
|
||||
pkgs.ncurses # For `tput`.
|
||||
pkgs.nix
|
||||
|
|
|
|||
|
|
@ -49,9 +49,19 @@ in
|
|||
|
||||
inherit (cfg.config) assertions warnings;
|
||||
|
||||
build.activationAfter.homeManager = ''
|
||||
${cfg.config.home.activationPackage}/activate
|
||||
'';
|
||||
build = {
|
||||
activationBefore = mkIf cfg.useUserPackages {
|
||||
setPriorityHomeManagerPath = ''
|
||||
if nix-env -q | grep '^home-manager-path$'; then
|
||||
$DRY_RUN_CMD nix-env $VERBOSE_ARG --set-flag priority 120 home-manager-path
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
activationAfter.homeManager = ''
|
||||
${cfg.config.home.activationPackage}/activate
|
||||
'';
|
||||
};
|
||||
|
||||
environment.packages = mkIf cfg.useUserPackages cfg.config.home.packages;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue