From 8234f81d9f81c611a1f4a831f87d758d3dbbce83 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:11:38 -0400
Subject: [PATCH 01/20] tab-rs: set meta.mainProgram

---
 pkgs/tools/misc/tab-rs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix
index 1782e327f8a6..3b463f22df07 100644
--- a/pkgs/tools/misc/tab-rs/default.nix
+++ b/pkgs/tools/misc/tab-rs/default.nix
@@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/austinjones/tab-rs";
     license = licenses.mit;
     maintainers = with maintainers; [ bbigras ];
+    mainProgram = "tab";
   };
 }

From 06bb6325b7267924631e81a44ccc69d0ca05f7ea Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:11:59 -0400
Subject: [PATCH 02/20] pax-rs: set meta.mainProgram

---
 pkgs/development/tools/pax-rs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index 248a137c49f6..1731dabf3704 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -14,6 +14,7 @@ buildRustPackage rec {
     license = licenses.mit;
     maintainers = [ maintainers.klntsky ];
     platforms = platforms.linux;
+    mainProgram = "px";
   };
 
   src =

From e878a508352ad489760d0fab9ebfe5d0c116efbc Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:13:29 -0400
Subject: [PATCH 03/20] gir-rs: set meta.mainProgram

---
 pkgs/development/tools/gir/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix
index 856cd44e26c0..2d1cdfc546b2 100644
--- a/pkgs/development/tools/gir/default.nix
+++ b/pkgs/development/tools/gir/default.nix
@@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/gtk-rs/gir/";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ ekleog ];
+    mainProgram = "gir";
   };
 }

From 6c0b7989feb82fcb3b88878c6c258b9dc57777f0 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:14:49 -0400
Subject: [PATCH 04/20] bunyan-rs: set meta.mainProgram

---
 pkgs/development/tools/bunyan-rs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix
index 12ced94c81b7..e5f58810ebf4 100644
--- a/pkgs/development/tools/bunyan-rs/default.nix
+++ b/pkgs/development/tools/bunyan-rs/default.nix
@@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/LukeMathWalker/bunyan";
     license = with licenses; [ asl20 mit ];
     maintainers = with maintainers; [ netcrns ];
+    mainProgram = "bunyan";
   };
 }

From acd320020d1b058f8f46893a86b410743b475d4d Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:19:56 -0400
Subject: [PATCH 05/20] vgo2nix: set meta.mainProgram

---
 pkgs/development/tools/vgo2nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index d48787ea017a..16926b16e981 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -34,6 +34,6 @@ buildGoModule {
     homepage = "https://github.com/nix-community/vgo2nix";
     license = licenses.mit;
     maintainers = with maintainers; [ adisbladis SuperSandro2000 ];
+    mainProgram = "vgo2nix";
   };
-
 }

From ac12e3e6733210a24859af36f92b1e21cf75333c Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:22:57 -0400
Subject: [PATCH 06/20] nitter: set meta.mainProgram

---
 pkgs/servers/nitter/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix
index 36bffaa3ec61..7abd3e865fcb 100644
--- a/pkgs/servers/nitter/default.nix
+++ b/pkgs/servers/nitter/default.nix
@@ -46,6 +46,6 @@ nimPackages.buildNimPackage rec {
     maintainers = with maintainers; [ erdnaxe ];
     license = licenses.agpl3Only;
     platforms = [ "x86_64-linux" ];
+    mainProgram = "nitter";
   };
 }
-

From 91c2bef35c45313f175777bfa3d213dea1525903 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:25:10 -0400
Subject: [PATCH 07/20] xtrt: set meta.mainProgram

---
 pkgs/tools/archivers/xtrt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/archivers/xtrt/default.nix b/pkgs/tools/archivers/xtrt/default.nix
index 175494057e0a..1d01935f9688 100644
--- a/pkgs/tools/archivers/xtrt/default.nix
+++ b/pkgs/tools/archivers/xtrt/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/figsoda/xtrt";
     license = licenses.unlicense;
     maintainers = with maintainers; [ figsoda ];
+    mainProgram = "xtrt";
   };
 }

From 1d4d39f0bcd4f11cae9ccbf717b99f124a83d8ed Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:27:04 -0400
Subject: [PATCH 08/20] fasd: set meta.mainProgram

---
 pkgs/tools/misc/fasd/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index 7e50c3e75513..76c7731e27f2 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
     PREFIX=$out make install
   '';
 
-  meta = {
-    homepage = "https://github.com/clvv/${pname}";
+  meta = with lib; {
+    homepage = "https://github.com/clvv/fasd";
     description = "Quick command-line access to files and directories for POSIX shells";
-    license = lib.licenses.mit;
+    license = licenses.mit;
 
     longDescription = ''
       Fasd is a command-line productivity booster.
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
       command line.
     '';
 
-    platforms = lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ];
+    mainProgram = "fasd";
   };
 }

From 60eb8d62a7bc03c4753e78340f7881a803224586 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:29:08 -0400
Subject: [PATCH 09/20] colorpicker: set meta.mainProgram

---
 pkgs/tools/misc/colorpicker/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix
index d2d0915a46fe..07d15469383d 100644
--- a/pkgs/tools/misc/colorpicker/default.nix
+++ b/pkgs/tools/misc/colorpicker/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Ancurio/colorpicker";
     maintainers = with maintainers; [ jb55 ];
     license = licenses.mit;
+    mainProgram = "colorpicker";
   };
 }

From a0926da31986f4f7ac889769b628ff347b63a755 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:30:25 -0400
Subject: [PATCH 10/20] bunnyfetch: set meta.mainProgram

---
 pkgs/tools/misc/bunnyfetch/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix
index 37a65d8c0718..e2b99da82db0 100644
--- a/pkgs/tools/misc/bunnyfetch/default.nix
+++ b/pkgs/tools/misc/bunnyfetch/default.nix
@@ -22,5 +22,6 @@ buildGoModule rec {
     license = licenses.mit;
     maintainers = with maintainers; [ devins2518 ];
     platforms = platforms.linux;
+    mainProgram = "bunnyfetch";
   };
 }

From c2cd221888a079fb7860a7a764d0f2a9cbfe3b1b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:32:24 -0400
Subject: [PATCH 11/20] sta: set meta.mainProgram

---
 pkgs/tools/misc/sta/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix
index 809287edcf62..6056fcfa49c3 100644
--- a/pkgs/tools/misc/sta/default.nix
+++ b/pkgs/tools/misc/sta/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ infinisil ];
     platforms = platforms.all;
     badPlatforms = platforms.darwin;
+    mainProgram = "sta";
   };
 }

From 4a49db328dea341e37a85271883400da4999e23a Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:33:25 -0400
Subject: [PATCH 12/20] powerline-go: set meta.mainProgram

---
 pkgs/tools/misc/powerline-go/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index 004bebaebbea..85d9ed59ff43 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -25,5 +25,6 @@ buildGoModule rec {
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ sifmelcara ];
+    mainProgram = "powerline-go";
   };
 }

From 5b494333fc19552d1450729692fa93be1e719036 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:36:23 -0400
Subject: [PATCH 13/20] loop: set meta.mainProgram

---
 pkgs/tools/misc/loop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index 17491b645d4b..6fa819cd8366 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -18,5 +18,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/Miserlou/Loop";
     maintainers = with maintainers; [ koral ];
     license = licenses.mit;
+    mainProgram = "loop";
   };
 }

From 9abb78b9ed6fdb76d6fd6cb42b83317b8e7a95e0 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:37:28 -0400
Subject: [PATCH 14/20] git-fire: set meta.mainProgram

---
 pkgs/tools/misc/git-fire/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix
index 32d7a169d72e..bc7e9f4840b7 100644
--- a/pkgs/tools/misc/git-fire/default.nix
+++ b/pkgs/tools/misc/git-fire/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/qw3rtman/git-fire";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ maintainers.swflint ];
+    maintainers = with maintainers; [ swflint ];
+    mainProgram = "git-fire";
   };
 }

From 14172a1f095dfb7d9e648cb2512424cf9e23a46a Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:38:15 -0400
Subject: [PATCH 15/20] fsearch: set meta.mainProgram

---
 pkgs/tools/misc/fsearch/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix
index e2782ef652be..7027a6da0fab 100644
--- a/pkgs/tools/misc/fsearch/default.nix
+++ b/pkgs/tools/misc/fsearch/default.nix
@@ -54,5 +54,6 @@ stdenv.mkDerivation {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ artturin ];
     platforms = platforms.unix;
+    mainProgram = "fsearch";
   };
 }

From bb73ba8e24f6b63593c76a0b1140987c9d921bfb Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:39:06 -0400
Subject: [PATCH 16/20] vimv: set meta.mainProgram

---
 pkgs/tools/misc/vimv/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/tools/misc/vimv/default.nix
index a36c9548462d..46753688ec73 100644
--- a/pkgs/tools/misc/vimv/default.nix
+++ b/pkgs/tools/misc/vimv/default.nix
@@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation {
     description = "Batch-rename files using Vim";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ maintainers.kmein ];
+    maintainers = with maintainers; [ kmein ];
+    mainProgram = "vimv";
   };
 }

From 899376d4be8db5880ee7137a389f50281dd5f479 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:40:18 -0400
Subject: [PATCH 17/20] licensor: set meta.mainProgram

---
 pkgs/tools/misc/licensor/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 6cf31c7835c1..93983c8fe40b 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/raftario/licensor";
     license = licenses.mit;
     maintainers = with maintainers; [ Br1ght0ne ];
+    mainProgram = "licensor";
   };
 }

From b433e3eed718b90a65b72316ebb732b4c5e8886f Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:49:49 -0400
Subject: [PATCH 18/20] fet-sh: set meta.mainProgram

---
 pkgs/tools/misc/fet-sh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix
index e9286e6a11e9..689eb0395f40 100644
--- a/pkgs/tools/misc/fet-sh/default.nix
+++ b/pkgs/tools/misc/fet-sh/default.nix
@@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
     license = licenses.isc;
     platforms = platforms.all;
     maintainers = with maintainers; [ elkowar ];
+    mainProgram = "fet.sh";
   };
-
 }

From 8916d1cbade66f97c4468bc2ed2c384eacca1f68 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:51:13 -0400
Subject: [PATCH 19/20] mmv-go: set meta.mainProgram

---
 pkgs/tools/misc/mmv-go/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix
index efca64bdc44a..8f6550d0592c 100644
--- a/pkgs/tools/misc/mmv-go/default.nix
+++ b/pkgs/tools/misc/mmv-go/default.nix
@@ -20,5 +20,6 @@ buildGoModule rec {
     description = "Rename multiple files using your $EDITOR";
     license = licenses.mit;
     maintainers = with maintainers; [ zowoq ];
+    mainProgram = "mmv";
   };
 }

From 530c363fd2febb4231c37b31cdea4b713c4a0a90 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 8 Oct 2021 15:52:00 -0400
Subject: [PATCH 20/20] cht-sh: set meta.mainProgram

---
 pkgs/tools/misc/cht.sh/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index 998fcf366520..e2672ab7bb0d 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -45,5 +45,6 @@ stdenv.mkDerivation {
     license = licenses.mit;
     maintainers = with maintainers; [ fgaz evanjs ];
     homepage = "https://github.com/chubin/cheat.sh";
+    mainProgram = "cht.sh";
   };
 }