From 26935021cf922d0c1c0c7d49c5f7a84ed2512fa0 Mon Sep 17 00:00:00 2001 From: vtgen <143022822+vtgen@users.noreply.github.com> Date: Sat, 3 Feb 2024 18:17:41 -0500 Subject: [PATCH 1/6] Update wrapper.nix --- nix/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/wrapper.nix b/nix/wrapper.nix index 570500c..7da6849 100644 --- a/nix/wrapper.nix +++ b/nix/wrapper.nix @@ -3,7 +3,7 @@ let mkCommand = name: v: let - drv = pkgs.writeShellApplication { inherit name; text = if builtins.typeOf v.exec == "string" then v.exec else ''${lib.getExe v.exec} "$@"''; }; + drv = pkgs.writeShellApplication { inherit name; text = if builtins.typeOf v.exec == "string" then v.exec else ''${lib.getExe v.exec} "$@"''; meta.mainProgram = if builtins.typeOf v.exec == "string" then v.exec else v.exec.meta.mainProgram}; in drv.overrideAttrs (oa: { meta.description = From 4e88b69a35d78b46a6308c432ffc851825e95322 Mon Sep 17 00:00:00 2001 From: vtgen <143022822+vtgen@users.noreply.github.com> Date: Sat, 3 Feb 2024 18:20:21 -0500 Subject: [PATCH 2/6] Update wrapper.nix --- nix/wrapper.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nix/wrapper.nix b/nix/wrapper.nix index 7da6849..c97ce5b 100644 --- a/nix/wrapper.nix +++ b/nix/wrapper.nix @@ -3,12 +3,14 @@ let mkCommand = name: v: let - drv = pkgs.writeShellApplication { inherit name; text = if builtins.typeOf v.exec == "string" then v.exec else ''${lib.getExe v.exec} "$@"''; meta.mainProgram = if builtins.typeOf v.exec == "string" then v.exec else v.exec.meta.mainProgram}; + drv = pkgs.writeShellApplication { inherit name; text = if builtins.typeOf v.exec == "string" then v.exec else ''${lib.getExe v.exec} "$@"'';}; in drv.overrideAttrs (oa: { meta.description = if v.description == null then oa.meta.description or "No description" else v.description; meta.category = v.category; + meta.mainProgram = + if v.mainProgram == null then oa.meta.name or "No name" else v.mainProgram; }); wrapCommands = spec: let From dfbe506edd2e304b33b761bad16c74e12373c3ec Mon Sep 17 00:00:00 2001 From: vtgen <143022822+vtgen@users.noreply.github.com> Date: Sat, 3 Feb 2024 18:22:24 -0500 Subject: [PATCH 3/6] Update wrapper.nix --- nix/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/wrapper.nix b/nix/wrapper.nix index c97ce5b..85f1378 100644 --- a/nix/wrapper.nix +++ b/nix/wrapper.nix @@ -10,7 +10,7 @@ let if v.description == null then oa.meta.description or "No description" else v.description; meta.category = v.category; meta.mainProgram = - if v.mainProgram == null then oa.meta.name or "No name" else v.mainProgram; + if oa.meta.mainProgram == null then v.name or "No name" else v.mainProgram; }); wrapCommands = spec: let From 93068eddb2b85aa659e9b181e1627558b6a13d69 Mon Sep 17 00:00:00 2001 From: vtgen <143022822+vtgen@users.noreply.github.com> Date: Sat, 3 Feb 2024 18:23:21 -0500 Subject: [PATCH 4/6] Update wrapper.nix --- nix/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/wrapper.nix b/nix/wrapper.nix index 85f1378..82c9c3c 100644 --- a/nix/wrapper.nix +++ b/nix/wrapper.nix @@ -10,7 +10,7 @@ let if v.description == null then oa.meta.description or "No description" else v.description; meta.category = v.category; meta.mainProgram = - if oa.meta.mainProgram == null then v.name or "No name" else v.mainProgram; + if oa.meta.mainProgram == null then v.name or "No name" else oa.meta.mainProgram; }); wrapCommands = spec: let From ec818405e2f22911a24af91e8b60b78c645b7bb2 Mon Sep 17 00:00:00 2001 From: vtgen <143022822+vtgen@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:51:19 -0400 Subject: [PATCH 5/6] Update nix/wrapper.nix Co-authored-by: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> --- nix/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/wrapper.nix b/nix/wrapper.nix index 82c9c3c..d081382 100644 --- a/nix/wrapper.nix +++ b/nix/wrapper.nix @@ -10,7 +10,7 @@ let if v.description == null then oa.meta.description or "No description" else v.description; meta.category = v.category; meta.mainProgram = - if oa.meta.mainProgram == null then v.name or "No name" else oa.meta.mainProgram; + oa.meta.mainProgram or v.name; }); wrapCommands = spec: let From c9689dd2c6cb2b3f766583ee391fb9b4abe5bb18 Mon Sep 17 00:00:00 2001 From: vtgen <143022822+vtgen@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:51:33 -0400 Subject: [PATCH 6/6] Update nix/wrapper.nix Co-authored-by: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> --- nix/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/wrapper.nix b/nix/wrapper.nix index d081382..932e2a3 100644 --- a/nix/wrapper.nix +++ b/nix/wrapper.nix @@ -3,7 +3,7 @@ let mkCommand = name: v: let - drv = pkgs.writeShellApplication { inherit name; text = if builtins.typeOf v.exec == "string" then v.exec else ''${lib.getExe v.exec} "$@"'';}; + drv = pkgs.writeShellApplication { inherit name; text = if builtins.typeOf v.exec == "string" then v.exec else ''${lib.getExe v.exec} "$@"''; }; in drv.overrideAttrs (oa: { meta.description =