nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #237744 from NixOS/backport-237025-to-release-23.05

Browse Source
This commit is contained in:
Sandro
2023-06-16 15:10:29 +02:00
committed by GitHub
parent 2decc88392 ffd21eabf7
commit c7ff1b9b95
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/misc/zammad/default.nix
View File

@@ -28,7 +28,10 @@ let
src = fetchFromGitHub (lib.importJSON ./source.json);
patches = [ ./0001-nulldb.patch ];
patches = [
./0001-nulldb.patch
./fix-sendmail-location.diff
];
postPatch = ''
sed -i -e "s|ruby '3.1.[0-9]\+'|ruby '${ruby.version}'|" Gemfile

12
pkgs/applications/networking/misc/zammad/fix-sendmail-location.diff Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/app/models/channel/driver/sendmail.rb b/app/models/channel/driver/sendmail.rb
index b15ef48a6..64c120a87 100644
--- a/app/models/channel/driver/sendmail.rb
+++ b/app/models/channel/driver/sendmail.rb
@@ -32,6 +32,6 @@ def delivery_method(mail)
return mail.delivery_method :test if Rails.env.test?
- mail.delivery_method :sendmail
+ mail.delivery_method :sendmail, :location => '/run/wrappers/bin/sendmail'
end
end