From 99e93489ae27439e23004b2f6ec7f560f4b6576d Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Mon, 19 Aug 2024 15:18:49 +0000
Subject: [PATCH] =?UTF-8?q?bees:=20substituteAll=20=E2=86=92=20makeWrapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is tidier, and removes manually-maintained nix-isms from the script.
---
 .../filesystems/bees/bees-service-wrapper     |  4 ---
 pkgs/tools/filesystems/bees/default.nix       | 25 +++++++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/tools/filesystems/bees/bees-service-wrapper
index 67c95e8f8031..ad72c1d95e9d 100755
--- a/pkgs/tools/filesystems/bees/bees-service-wrapper
+++ b/pkgs/tools/filesystems/bees/bees-service-wrapper
@@ -1,7 +1,3 @@
-#!@bash@/bin/bash
-PATH=@bash@/bin:@coreutils@/bin:@utillinux@/bin:@btrfsProgs@/bin:$PATH
-beesd_bin=@bees@/lib/bees/bees
-# PLEASE KEEP NIX-ISMS ABOVE THIS LINE TO EASE UPSTREAM MERGE
 #!/usr/bin/env bash
 
 shopt -s extglob
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index a955385c2183..a014f449079c 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -1,12 +1,16 @@
 { lib
-, stdenv
 , fetchFromGitHub
-, bash
-, btrfs-progs
-, coreutils
-, python3Packages
-, util-linux
+, makeWrapper
 , nixosTests
+
+, stdenv
+# Build inputs
+, btrfs-progs
+, util-linux
+, python3Packages
+# bees-service-wrapper
+, bash
+, coreutils
 }:
 
 stdenv.mkDerivation rec {
@@ -26,6 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    makeWrapper
     python3Packages.markdown # documentation build
   ];
 
@@ -38,12 +43,10 @@ stdenv.mkDerivation rec {
     unset -f git
   '';
 
-  inherit bash bees coreutils;
-  utillinux = util-linux;
-  btrfsProgs = btrfs-progs;
   postInstall = ''
-    substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
-    chmod +x "$out"/bin/bees-service-wrapper
+    makeWrapper ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper \
+      --prefix PATH : ${lib.makeBinPath [ bash coreutils util-linux btrfs-progs ]} \
+      --set beesd_bin "$out"/lib/bees/bees
   '';
 
   buildFlags = [