lang/org: fix org-ditaa jar paths

Now also includes contrib/scripts in org-mode's build directory.

modules/lang/org/config.el

@@ -272,6 +272,12 @@ Also adds support for a `:sync' parameter to override `:async'."
   (after! python
     (setq org-babel-python-command python-shell-interpreter))
 
+  (after! ob-ditaa
+    ;; TODO Should be fixed upstream
+    (let ((default-directory (org-find-library-dir "org-contribdir")))
+      (setq org-ditaa-jar-path     (expand-file-name "scripts/ditaa.jar")
+            org-ditaa-eps-jar-path (expand-file-name "scripts/DitaaEps.jar"))))
+
   ;; NOTE Backported from Emacs 27.1
   ;; DEPRECATED Remove when 26.x support is dropped
   (unless EMACS27+

modules/lang/org/packages.el

@@ -6,7 +6,7 @@
 (package! org-mode
   :recipe (:host github
            :repo "emacs-straight/org-mode"
-           :files ("*.el" "lisp/*.el" "contrib/lisp/*.el")
+           :files ("*.el" "lisp/*.el" "contrib/lisp/*.el" "contrib/scripts")
            ;; HACK A necessary hack because org requires a compilation step
            ;;      after being cloned, and during that compilation a
            ;;      org-version.el is generated with these two functions, which