From b5ec72fc13d94ad709bd013eeeaba54b258de18f Mon Sep 17 00:00:00 2001
From: Taeer Bar-Yam <taeer@bar-yam.me>
Date: Tue, 22 Feb 2022 07:38:01 -0500
Subject: [PATCH] tweaks

---
 nixos/modules/services/development/zammad.nix        | 1 -
 pkgs/applications/networking/misc/zammad/default.nix | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix
index dc3a6d104696..8a6c512b017e 100644
--- a/nixos/modules/services/development/zammad.nix
+++ b/nixos/modules/services/development/zammad.nix
@@ -307,7 +307,6 @@ in
       serviceConfig = serviceConfig // { Type = "forking"; };
       after = [ "zammad-web.service" ];
       requires = [ "zammad-web.service" ];
-      wants = [ "zammad-web.service" ];
       description = "Zammad scheduler";
       wantedBy = [ "multi-user.target" ];
       script = "./script/scheduler.rb start";
diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix
index 718839184f59..0b5d691c18e6 100644
--- a/pkgs/applications/networking/misc/zammad/default.nix
+++ b/pkgs/applications/networking/misc/zammad/default.nix
@@ -23,7 +23,7 @@ let
 
   src = applyPatches {
 
-    src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./source.json));
+    src = fetchFromGitHub (lib.importJSON ./source.json);
 
     patches = [ ./0001-nulldb.patch ];
 
@@ -52,7 +52,7 @@ let
     #   https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language
     inherit ruby_2_7;
 
-    gemdir = src;
+    gemdir = "${src}";
     gemset = ./gemset.nix;
     groups = [
       "assets"
@@ -89,7 +89,7 @@ let
     inherit version src;
     yarnLock = ./yarn.lock;
     yarnNix = ./yarn.nix;
-    packageJSON = src + "/package.json";
+    packageJSON = "${src}/package.json";
   };
 
 in