mirror of
https://github.com/nix-community/flakelight.git
synced 2025-03-10 20:18:12 +01:00
Fix mkApp
Using lib.getExe makes mkApp not work for derivations that are files. Thus, this makes it so that the derivation is used as is. If an executable in the derivation's directory is needed, a string path can be used.
This commit is contained in:
parent
b1fe8e8e17
commit
2775ef4d94
@ -153,13 +153,7 @@ let
|
|||||||
|
|
||||||
mkApp = lib: app:
|
mkApp = lib: app:
|
||||||
if isApp app then app
|
if isApp app then app
|
||||||
else {
|
else { type = "app"; program = "${app}"; };
|
||||||
type = "app";
|
|
||||||
program =
|
|
||||||
if lib.isDerivation app
|
|
||||||
then lib.getExe app
|
|
||||||
else app;
|
|
||||||
};
|
|
||||||
|
|
||||||
eachSystem = fn: foldAttrs mergeAttrs { } (map
|
eachSystem = fn: foldAttrs mergeAttrs { } (map
|
||||||
(system: mapAttrs
|
(system: mapAttrs
|
||||||
|
Loading…
Reference in New Issue
Block a user