From c5e149a9d9cf25c68da817f46ea0cbf5442d39bd Mon Sep 17 00:00:00 2001 From: Trevor Hass Date: Tue, 13 Apr 2021 22:05:08 -0500 Subject: gnu: minetest: Fix absolute path to 'rm' command. * gnu/packages/games.scm (minetest)[patch-sources]: Substitute '/bin/rm' path. [inputs]: Add coreutils. Signed-off-by: Leo Prikler --- gnu/packages/games.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dbc72446b2..91ac839aee 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -52,7 +52,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2020 Trevor Hass +;;; Copyright © 2020, 2021 Trevor Hass ;;; Copyright © 2020, 2021 Leo Prikler ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández @@ -3486,8 +3486,13 @@ match, cannon keep, and grave-itation pit.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + ;; Use store-path for "rm" instead of non-existing FHS path. + (("\"/bin/rm\"") + (string-append "\"" (assoc-ref inputs "coreutils") "/bin/rm\""))) (substitute* "src/CMakeLists.txt" + ;; Let minetest binary remain in build directory. (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) (substitute* "src/unittest/test_servermodmanager.cpp" ;; do no override MINETEST_SUBGAME_PATH @@ -3511,7 +3516,8 @@ match, cannon keep, and grave-itation pit.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("curl" ,curl) + `(("coreutils" ,coreutils) + ("curl" ,curl) ("freetype" ,freetype) ("gettext" ,gettext-minimal) ("gmp" ,gmp) -- cgit v1.2.3