From 3e153863b524f8c97ae3dd25b41950054bbdc0bf Mon Sep 17 00:00:00 2001
From: Massimo Gengarelli <massimo.gengarelli@gmail.com>
Date: Mon, 26 Feb 2024 20:15:39 +0100
Subject: [PATCH 1/2] onedriver: fix systemd service (closes #291608)

---
 pkgs/by-name/on/onedriver/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix
index f3182a611430..967206b5986e 100644
--- a/pkgs/by-name/on/onedriver/package.nix
+++ b/pkgs/by-name/on/onedriver/package.nix
@@ -40,6 +40,7 @@ buildGoModule {
     install -Dm644 ./pkg/resources/onedriver-128.png $out/share/icons/onedriver/onedriver-128.png
 
     install -Dm644 ./pkg/resources/onedriver.desktop $out/share/applications/onedriver.desktop
+    install -Dm644 ./pkg/resources/onedriver@.service $out/lib/systemd/user/onedriver@.service
 
     mkdir -p $out/share/man/man1
     installManPage ./pkg/resources/onedriver.1
@@ -47,6 +48,10 @@ buildGoModule {
     substituteInPlace $out/share/applications/onedriver.desktop \
       --replace "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \
       --replace "/usr/share/icons" "$out/share/icons"
+
+    substituteInPlace $out/lib/systemd/user/onedriver@.service \
+      --replace "/usr/bin/onedriver" "$out/bin/onedriver" \
+      --replace "/usr/bin/fusermount" "${fuse}/bin/fusermount"
   '';
 
   meta = with lib; {

From baf6a41e9f56f5f9b2909d1ee03a9a463725e553 Mon Sep 17 00:00:00 2001
From: Massimo Gengarelli <massimo.gengarelli@gmail.com>
Date: Sun, 3 Mar 2024 18:27:45 +0100
Subject: [PATCH 2/2] fixup! onedriver: fix systemd service (closes #291608)

---
 pkgs/by-name/on/onedriver/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix
index 967206b5986e..348f4b658b4c 100644
--- a/pkgs/by-name/on/onedriver/package.nix
+++ b/pkgs/by-name/on/onedriver/package.nix
@@ -7,6 +7,7 @@
 , fuse
 , installShellFiles
 , wrapGAppsHook
+, wrapperDir ? "/run/wrappers/bin"
 }:
 let
   pname = "onedriver";
@@ -51,7 +52,7 @@ buildGoModule {
 
     substituteInPlace $out/lib/systemd/user/onedriver@.service \
       --replace "/usr/bin/onedriver" "$out/bin/onedriver" \
-      --replace "/usr/bin/fusermount" "${fuse}/bin/fusermount"
+      --replace "/usr/bin/fusermount" "${wrapperDir}/fusermount"
   '';
 
   meta = with lib; {