From bf54a4c45a2ab5d0aec01641969acf9998e9d09c Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 27 Jul 2024 00:41:31 +0530
Subject: [PATCH] uwsm: fix dependencies add wrap the binary as well

add mainProgram

Co-authored-by: Kai Norman Clasen <k.clasen@protonmail.com>
(cherry picked from commit 6317528b1a8830e4ac79462dc55636f08c514fa9)
---
 pkgs/by-name/uw/uwsm/package.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 0fafbd458d3c..4d7eb5cc34be 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -2,13 +2,16 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  makeBinaryWrapper,
   meson,
   ninja,
   scdoc,
   pkg-config,
   nix-update-script,
+  bash,
   dmenu,
   libnotify,
+  newt,
   python3Packages,
   util-linux,
   fumonSupport ? true,
@@ -34,19 +37,21 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
+    makeBinaryWrapper
     meson
     ninja
     pkg-config
     scdoc
   ];
 
-  buildInputs = [
-    libnotify
-    util-linux
+  propagatedBuildInputs = [
+    util-linux # waitpid
+    newt # whiptail
+    libnotify # notify
+    bash # sh
+    python
   ] ++ (lib.optionals uuctlSupport [ dmenu ]);
 
-  propagatedBuildInputs = [ python ];
-
   mesonFlags = [
     "--prefix=${placeholder "out"}"
     (lib.mapAttrsToList lib.mesonEnable {
@@ -61,9 +66,19 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
+  postInstall = ''
+    wrapProgram $out/bin/uwsm \
+      --prefix PATH : ${lib.makeBinPath finalAttrs.propagatedBuildInputs}
+    ${lib.optionalString uuctlSupport ''
+      wrapProgram $out/bin/uuctl \
+        --prefix PATH : ${lib.makeBinPath finalAttrs.propagatedBuildInputs}
+    ''}
+  '';
+
   meta = {
     description = "Universal wayland session manager";
     homepage = "https://github.com/Vladimir-csp/uwsm";
+    mainProgram = "uwsm";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       johnrtitor