From 3e7ec42d6884aa6fff7b7e5802c1b988a443bca2 Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Mon, 14 Jun 2021 13:09:57 -0600
Subject: [PATCH] espanso: add runtime dependencies correctly, nixos/espanso
 remove path hack

---
 nixos/modules/services/desktops/espanso.nix  | 1 -
 pkgs/applications/office/espanso/default.nix | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix
index cd2eadf88168..4ef6724dda0a 100644
--- a/nixos/modules/services/desktops/espanso.nix
+++ b/nixos/modules/services/desktops/espanso.nix
@@ -12,7 +12,6 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.espanso = {
       description = "Espanso daemon";
-      path = with pkgs; [ espanso libnotify xclip ];
       serviceConfig = {
         ExecStart = "${pkgs.espanso}/bin/espanso daemon";
         Restart = "on-failure";
diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix
index 5cbfa5b1b2af..adeb087ae8be 100644
--- a/pkgs/applications/office/espanso/default.nix
+++ b/pkgs/applications/office/espanso/default.nix
@@ -10,6 +10,7 @@
 , openssl
 , xclip
 , xdotool
+, makeWrapper
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     extra-cmake-modules
     pkg-config
+    makeWrapper
   ];
 
   buildInputs = [
@@ -35,6 +37,7 @@ rustPlatform.buildRustPackage rec {
     libXtst
     libXi
     libnotify
+    xclip
     openssl
     xdotool
   ];
@@ -42,6 +45,11 @@ rustPlatform.buildRustPackage rec {
   # Some tests require networking
   doCheck = false;
 
+  postInstall = ''
+    wrapProgram $out/bin/espanso \
+      --prefix PATH : ${lib.makeBinPath [ libnotify xclip ]}
+  '';
+
   meta = with lib; {
     description = "Cross-platform Text Expander written in Rust";
     homepage = "https://espanso.org";