From b420ef5912b6b04023991f44db3e8a4f32091022 Mon Sep 17 00:00:00 2001 From: Trevor Hass Date: Tue, 13 Apr 2021 22:05:08 -0500 Subject: [PATCH] gnu: minetest: Fix absolute path to 'rm' command. * gnu/packages/games.scm (minetest): Add 'set-rm' phase to substitute absolute path to 'rm'. Add 'coreutils' to inputs. --- gnu/packages/games.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dbc72446b2..6dedfa7419 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 @@ -3496,6 +3496,12 @@ match, cannon keep, and grave-itation pit.") (setenv "MINETEST_SUBGAME_PATH" (string-append (getcwd) "/games")) ; for check #t)) + (add-after 'unpack 'set-rm + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + (("\"/bin/rm\"") + (string-append "\"" (assoc-ref inputs "coreutils") "/bin/rm\""))) + #t)) (replace 'check (lambda _ ;; Thanks to our substitutions, the tests should also run @@ -3511,7 +3517,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) -- 2.31.1