From acd542d16b086b2aeb823c090bf6121e7a1af12b Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 31 Jul 2023 08:56:50 -0700
Subject: [PATCH] apps: use lib.getExe to find executable
---
modules/apps.nix | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/modules/apps.nix b/modules/apps.nix
index 0fd5d7c..c49073d 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -3,6 +3,7 @@ let
inherit (lib)
mkOption
types
+ getExe
;
inherit (flake-parts-lib)
mkTransposedPerSystemModule
@@ -14,9 +15,6 @@ let
check = lib.isDerivation;
};
- getExe = x:
- "${lib.getBin x}/bin/${x.meta.mainProgram or (throw ''Package ${x.name or ""} does not have meta.mainProgram set, so I don't know how to find the main executable. You can set meta.mainProgram, or pass the full path to executable, e.g. program = "''${pkg}/bin/foo"'')}";
-
appType = lib.types.submodule {
options = {
type = mkOption {