From eef3f8fe8b68ab6415fb5617086b8e904149de51 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Thu, 28 May 2026 01:22:08 +0900 Subject: [PATCH] bekkalokk/mediawiki: cleanup executable path config --- hosts/bekkalokk/services/mediawiki/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hosts/bekkalokk/services/mediawiki/default.nix b/hosts/bekkalokk/services/mediawiki/default.nix index 3fe4c91..bb13217 100644 --- a/hosts/bekkalokk/services/mediawiki/default.nix +++ b/hosts/bekkalokk/services/mediawiki/default.nix @@ -181,12 +181,17 @@ in { ]; # Misc program paths - $wgFFmpegLocation = '${pkgs.ffmpeg}/bin/ffmpeg'; - $wgExiftool = '${pkgs.exiftool}/bin/exiftool'; - $wgExiv2Command = '${pkgs.exiv2}/bin/exiv2'; + $wgFFmpegLocation = '${lib.getExe pkgs.ffmpeg}'; + $wgExiftool = '${lib.getExe pkgs.exiftool}'; + $wgExiv2Command = '${lib.getExe pkgs.exiv2}'; # See https://gist.github.com/sergejmueller/088dce028b6dd120a16e - $wgJpegTran = '${pkgs.mozjpeg}/bin/jpegtran'; - $wgGitBin = '${pkgs.git}/bin/git'; + $wgJpegTran = '${lib.getExe' pkgs.mozjpeg "jpegtran"}'; + $wgGitBin = '${lib.getExe pkgs.git}'; + $wgDiff3 = '${lib.getExe' pkgs.diffutils "diff3"}'; + $wgDiff = '${lib.getExe' pkgs.diffutils "diff"}'; + + $wgUseImageMagick = true; + $wgImageMagickConvertCommand = '${lib.getExe pkgs.imagemagick}'; # Debugging $wgShowExceptionDetails = false;