From 1e4085670a149df7e9858ef6c52995415cf27037 Mon Sep 17 00:00:00 2001 Message-ID: <1e4085670a149df7e9858ef6c52995415cf27037.1691235884.git.iyzsong@member.fsf.org> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 5 Aug 2023 15:37:57 +0800 Subject: [PATCH 1/2] gnu: kajongg: Hardcode paths to 'ogg123' and 'python3'. * gnu/packages/kde-games.scm (kajongg)[inputs]: Add vorbis-tools. [arguments]<#:phases>: Hardcode paths to 'ogg123' and 'python3'. --- gnu/packages/kde-games.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index a47deb6c68..9e2b885c2b 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -37,7 +37,8 @@ (define-module (gnu packages kde-games) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages qt)) + #:use-module (gnu packages qt) + #:use-module (gnu packages xiph)) (define-public ktuberling (package @@ -300,7 +301,15 @@ (define-public kajongg (substitute* "src/mjresource.py" (("'share', 'kmahjongglib'" all) (string-append "'" (assoc-ref inputs "libkmahjongg") - "/share', 'kmahjongglib'"))))) + "/share', 'kmahjongglib'"))) + (substitute* "src/sound.py" + (("oggBinary = 'ogg123'") + (format #f "oggBinary = '~a'" + (search-input-file inputs "bin/ogg123")))) + (substitute* "src/common.py" + (("interpreterName = 'python3'") + (format #f "interpreterName = '~a'" + (search-input-file inputs "bin/python3")))))) (add-after 'qt-wrap 'wrap (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -327,7 +336,8 @@ (define-public kajongg python-qtpy python-zope-interface qtbase-5 - qtsvg-5)) + qtsvg-5 + vorbis-tools)) (home-page "https://apps.kde.org/kajongg/") (synopsis "Classical Mah Jongg game for 4 players") (description "Kajongg is the ancient Chinese board game for 4 players. base-commit: 0a4490e4fd77a0dd50262d080bd024a2f41cdc4a -- 2.41.0