~ruther/guix-local: gnu: dolphin-emu: Avoid cyclic module dependency issues.

6c98ad8ac93a08f99536968c43990ef06ee398e3 — Maxim Cournoyer 9 months ago 065a80c

gnu: dolphin-emu: Avoid cyclic module dependency issues.

The source snippets are not delayed, while arguments are.

* gnu/packages/emulators.scm (dolphin-emu)
[source] <snippet>: Move copying of implot sources...
[#:phases] {copy-implot-source}: ... to this new phase.

Fixes: #1977
Change-Id: Iecf853adb13d54e3eaa63878a5b3d90f43781514

patch browse .tar.gz

1 files changed, 7 insertions(+), 3 deletions(-)

M gnu/packages/emulators.scm

M gnu/packages/emulators.scm => gnu/packages/emulators.scm +7 -3

@@ 468,10 468,10 @@ It aims to support Nintendo DSi and 3DS as well.")
                               "rangeset"
                               "rcheevos") ;submodule
               (with-directory-excursion "Externals"
+                ;; Note: Not copying implot sources here, which would
+                ;; introduce a top-level circular dependency.
                 (copy-recursively #$dolphin-rcheevos-submodule
-                                  "rcheevos/rcheevos")
-                (copy-recursively #$(package-source implot)
-                                  "implot/implot"))
+                                  "rcheevos/rcheevos"))
 
               (for-each delete-file
                         (find-files


@@ 495,6 495,10 @@ It aims to support Nintendo DSi and 3DS as well.")
                     (guix build utils))
         #:phases
         #~(modify-phases %standard-phases
+            (add-after 'unpack 'copy-implot-source
+              (lambda _
+                (copy-recursively #$(package-source implot)
+                                  "Externals/implot/implot")))
             (add-before 'configure 'generate-fonts&hardcode-libvulkan-path
               (lambda* (#:key inputs #:allow-other-keys)
                 (let ((fontfile