From cb040e92e88c1e6261873a01c12e1bbfc876c099 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 6 Feb 2025 16:55:17 +0100 Subject: [PATCH] Fix 'nix run' Find `app.program` in a slightly more idiomatic way --- flake.nix | 2 +- nix/crane.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 45d9799..3e62d7c 100644 --- a/flake.nix +++ b/flake.nix @@ -88,7 +88,7 @@ default = { type = "app"; program = - artifacts.crane-outputs.packages.genealogos-cli.passthru.exePath; + pkgs.lib.getExe artifacts.crane-outputs.packages.genealogos-cli; }; }); diff --git a/nix/crane.nix b/nix/crane.nix index 0d51d25..d59ac1b 100644 --- a/nix/crane.nix +++ b/nix/crane.nix @@ -47,12 +47,17 @@ let cargoExtraArgs = "-p genealogos-cli"; } // pkgs.lib.attrsets.optionalAttrs binary { - passthru.exePath = "/bin/genealogos"; nativeBuildInputs = common-crane-args.nativeBuildInputs ++ [ pkgs.makeWrapper ]; preFixup = '' wrapProgram $out/bin/genealogos \ --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]} ''; + meta = { + description = "Takes output from Nix evaluation tools and produces BOM files."; + homepage = "https://github.com/tweag/genealogos"; + license = pkgs.lib.licenses.mit; + mainProgram = "genealogos"; + }; }); genealogos-api = (common-crane-args // {