unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#74753] [PATCH] gnu: hyprlang: Fix cross-compilation.
@ 2024-12-09 16:56 Hilton Chain
  2024-12-12 11:49 ` bug#74753: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Hilton Chain @ 2024-12-09 16:56 UTC (permalink / raw)
  To: 74753; +Cc: Hilton Chain

* gnu/packages/cpp.scm (hyprlang)[arguments]<#:phases>: Set
PKG_CONFIG_EXECUTABLE in CMakeLists.txt.

Change-Id: Ied775ece2de83f6842bf405be76ce7f33fdce5fe
---
 gnu/packages/cpp.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index a72f491fd0..4fd5f8fa00 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -678,6 +678,17 @@ (define-public hyprlang
                (base32
                 "0yvfrz3hdyxzhngzhr0bgc5279ra5fv01hbfi6pdj84pz0lpaw02"))))
     (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-cross-compilation
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("find_package.PkgConfig" all)
+                 (string-append
+                  "set(PKG_CONFIG_EXECUTABLE " #$(pkg-config-for-target) ")\n"
+                  all))))))))
     (native-inputs (list gcc-13 pkg-config))
     (inputs (list hyprutils))
     (home-page "https://wiki.hyprland.org/Hypr-Ecosystem/hyprlang/")

base-commit: 9d09b0cf841fb657a1aec12e9bab68e00c2b493c
prerequisite-patch-id: f132b4af7b85df465998e4f459bf729f8b66f320
prerequisite-patch-id: 71423f8b55ad6f04c3f3d647cbd9d42c6c332e06
prerequisite-patch-id: 1076bb75432f82f35d834ca4f97dffebd0ce98d5
prerequisite-patch-id: ecd87e69b7aebebd64256db106ed96dc12f6c12d
prerequisite-patch-id: e0e81738807e886ac5109a7d26f841204a35d8a7
prerequisite-patch-id: f27c33b6c7f5dcb37c36551ecde29f1f0c734935
prerequisite-patch-id: fc6ad5af54f75869a657c065c86b262d74a1efff
prerequisite-patch-id: 1665e62d1990a460bc5679bc89d600e94bab407a
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#74753: [PATCH] gnu: hyprlang: Fix cross-compilation.
  2024-12-09 16:56 [bug#74753] [PATCH] gnu: hyprlang: Fix cross-compilation Hilton Chain
@ 2024-12-12 11:49 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2024-12-12 11:49 UTC (permalink / raw)
  To: Hilton Chain; +Cc: 74753-done

Hilton Chain <hako@ultrarare.space> skribis:

> * gnu/packages/cpp.scm (hyprlang)[arguments]<#:phases>: Set
> PKG_CONFIG_EXECUTABLE in CMakeLists.txt.
>
> Change-Id: Ied775ece2de83f6842bf405be76ce7f33fdce5fe

Applied, thanks!




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-12-12 12:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-09 16:56 [bug#74753] [PATCH] gnu: hyprlang: Fix cross-compilation Hilton Chain
2024-12-12 11:49 ` bug#74753: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).