From d08f8d0c9800165ba8a766cf798b0aa9b4089041 Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Tue, 21 Nov 2023 10:52:06 -0500
Subject: [PATCH 1/2] bat-extras: set pname to executable name

This is the easiest way to make bat-extras scripts runnable directly as flakes,
e.g. nix run nixpkgs#bat-extras.batgrep. There are other ways but this one is
nice and simple.
---
 pkgs/tools/misc/bat-extras/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 0863ebde2afa..20927a69ab15 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -94,7 +94,7 @@ let
     name: # the name of the script
     dependencies: # the tools we need to prefix onto PATH
     stdenv.mkDerivation {
-      pname = "${core.pname}-${name}";
+      pname = name;
       inherit (core) version;
 
       src = core;

From 6b6dd4509e78de088873eeb24dd34888d7eb77d9 Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Fri, 26 Jan 2024 12:45:26 -0500
Subject: [PATCH 2/2] bat-extras: also set meta.mainProgram

---
 pkgs/tools/misc/bat-extras/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 20927a69ab15..0bed11331aa3 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -133,7 +133,9 @@ let
       # We already patched
       dontPatchShebangs = true;
 
-      inherit (core) meta;
+      meta = core.meta // {
+        mainProgram = name;
+      };
     };
   optionalDep = cond: dep:
     assert cond -> dep != null;