From 6386d793261ae917ae49bf95f587787c5b00db47 Mon Sep 17 00:00:00 2001
From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com>
Date: Mon, 31 Oct 2022 16:48:07 +0000
Subject: [PATCH] patchRcPath hooks: use the passthru argument

---
 .../patch-rc-path-hooks/default.nix           | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix b/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix
index 73fbfa6e9b72..f16644528f00 100644
--- a/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix
+++ b/pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix
@@ -7,19 +7,18 @@ let
   tests = import ./test { inherit callPackage; };
 in
 {
-  patchRcPathBash = (makeSetupHook
+  patchRcPathBash = makeSetupHook
     {
       name = "patch-rc-path-bash";
       meta = with lib; {
         description = "Setup-hook to inject source-time PATH prefix to a Bash/Ksh/Zsh script";
         maintainers = with maintainers; [ ShamrockLee ];
       };
-    } ./patch-rc-path-bash.sh).overrideAttrs (oldAttrs: {
-    passthru.tests = {
-      inherit (tests) test-bash;
-    };
-  });
-  patchRcPathCsh = (makeSetupHook
+      passthru.tests = {
+        inherit (tests) test-bash;
+      };
+    } ./patch-rc-path-bash.sh;
+  patchRcPathCsh = makeSetupHook
     {
       name = "patch-rc-path-csh";
       substitutions = {
@@ -29,24 +28,22 @@ in
         description = "Setup-hook to inject source-time PATH prefix to a Csh script";
         maintainers = with maintainers; [ ShamrockLee ];
       };
-    } ./patch-rc-path-csh.sh).overrideAttrs (oldAttrs: {
-    passthru.tests = {
-      inherit (tests) test-csh;
-    };
-  });
-  patchRcPathFish = (makeSetupHook
+      passthru.tests = {
+        inherit (tests) test-csh;
+      };
+    } ./patch-rc-path-csh.sh;
+  patchRcPathFish = makeSetupHook
     {
       name = "patch-rc-path-fish";
       meta = with lib; {
         description = "Setup-hook to inject source-time PATH prefix to a Fish script";
         maintainers = with maintainers; [ ShamrockLee ];
       };
-    } ./patch-rc-path-fish.sh).overrideAttrs (oldAttrs: {
-    passthru.tests = {
-      inherit (tests) test-fish;
-    };
-  });
-  patchRcPathPosix = (makeSetupHook
+      passthru.tests = {
+        inherit (tests) test-fish;
+      };
+    } ./patch-rc-path-fish.sh;
+  patchRcPathPosix = makeSetupHook
     {
       name = "patch-rc-path-posix";
       substitutions = {
@@ -56,9 +53,8 @@ in
         description = "Setup-hook to inject source-time PATH prefix to a POSIX shell script";
         maintainers = with maintainers; [ ShamrockLee ];
       };
-    } ./patch-rc-path-posix.sh).overrideAttrs (oldAttrs: {
-    passthru.tests = {
-      inherit (tests) test-posix;
-    };
-  });
+      passthru.tests = {
+        inherit (tests) test-posix;
+      };
+    } ./patch-rc-path-posix.sh;
 }