foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-07 18:19:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

programs/pop-launcher: fix package list to actually install the specified package

Browse Source
This commit is contained in:
Gabriel Arazas 2022-08-14 11:31:57 +08:00
parent a642c09ec3
commit 96ab200946
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/home-manager/programs/pop-launcher.nix
View File

@ -12,11 +12,18 @@ let
dontRewriteSymlinks = true; dontRewriteSymlinks = true;
}); });
# Some plugins may be packaged ala-busybox with multiple plugins coming from
# the same binary. Similar reasons as to why we don't want to rewrite
# symlinks with the main package.
plugins = lib.map (p: p.overrideAttrs (prev: {
dontRewriteSymlinks = true;
})) cfg.plugins;
# Plugins and scripts are assumed to be packaged at # Plugins and scripts are assumed to be packaged at
# `$out/share/pop-launcher`. # `$out/share/pop-launcher`.
pluginsDir = pkgs.symlinkJoin { pluginsDir = pkgs.symlinkJoin {
name = "pop-launcher-plugins-system"; name = "pop-launcher-plugins-system";
paths = builtins.map (p: "${p}/share/pop-launcher") (cfg.plugins ++ [ package ]); paths = builtins.map (p: "${p}/share/pop-launcher") (plugins ++ [ package ]);
}; };
in in
{ {
@ -64,12 +71,8 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# The local plugin path is hardcoded so we'll also do that instead of # The local plugin path is hardcoded so we'll also do that instead of
# properly setting in `xdg.dataFile`. # properly setting in `xdg.dataFile`.
home.file.".local/share/pop-launcher" = lib.mkIf (cfg.plugins != []) { home.file.".local/share/pop-launcher".source = pluginsDir;
source = pluginsDir;
};
home.packages = with pkgs; [ home.packages = [ package ];
pop-launcher
];
}; };
} }

4
modules/nixos/programs/pop-launcher.nix
View File

@ -72,8 +72,6 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.etc.pop-launcher.source = pluginsDir; environment.etc.pop-launcher.source = pluginsDir;
environment.systemPackages = with pkgs; [ environment.systemPackages = [ package ];
pop-launcher
];
}; };
} }