nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increase priority value to avoid conflict

Browse source 
When enabling useUserPackages, there is a conflict of duplicate package
installations.
This commit is contained in:
Tobias Happ 2020-01-05 23:34:46 +01:00 • committed by Alexander Sosedkin
parent a1c91e7753
commit d848df3a33
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/build/activation.nix
View file

@ -17,6 +17,7 @@ let
pkgs.coreutils pkgs.coreutils
pkgs.diffutils pkgs.diffutils
pkgs.findutils pkgs.findutils
pkgs.gnugrep
pkgs.gnused pkgs.gnused
pkgs.ncurses # For `tput`. pkgs.ncurses # For `tput`.
pkgs.nix pkgs.nix

16
modules/home-manager.nix
View file

@ -49,9 +49,19 @@ in
inherit (cfg.config) assertions warnings; inherit (cfg.config) assertions warnings;
build.activationAfter.homeManager = '' build = {
${cfg.config.home.activationPackage}/activate 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; environment.packages = mkIf cfg.useUserPackages cfg.config.home.packages;