diff mbox series

[bug#45120] : Remove stale build steps for Fcitx5 components

Message ID 86wnxsflti.fsf@163.com
State Accepted
Headers show
Series [bug#45120] : Remove stale build steps for Fcitx5 components | expand

Checks

Context Check Description
cbaines/submitting builds success
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Zhu Zihao Dec. 8, 2020, 1:51 p.m. UTC 
These are the patches should be merge in
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=44920 but missed.

Comments

Zhu Zihao Dec. 8, 2020, 1:57 p.m. UTC | #1 
I create a new thread here for missing patches.
宋文武 Dec. 11, 2020, 1:24 p.m. UTC | #2 
Zhu Zihao <all_but_last@163.com> writes:

> I create a new thread here for missing patches.

Pushed, thank you!
diff mbox series

Patch

From 1b54678aade98dc47ef4071ae5525699ff29ab2b Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Tue, 8 Dec 2020 21:45:56 +0800
Subject: [PATCH 2/2] gnu: fcitx5-chinese-addons: Remove stale build steps.

* gnu/packages/fcitx5.scm(fcitx5-chinese-addons)[arguments]
<configure-flags>: Remove it.
<phases>: Remove phase 'patch-install-prefix'.
---
 gnu/packages/fcitx5.scm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 68ff7cf5cd..7c10f97440 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -293,23 +293,8 @@  for Qt based application.")
         (base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags
-       (list
-        (string-append "-DFEM_INCLUDE_INSTALL_DIR=" %output "/include")
-        (string-append "-DFEM_LIB_INSTALL_DIR=" %output "/lib"))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'patch-install-prefix
-           (lambda* (#:key outputs #:allow-other-keys)
-             (for-each
-              (lambda (x)
-                (format #t "patch-install-prefix: Fixing install prefix in ~a~%"
-                        x)
-                (substitute* x
-                  (("\\$\\{FCITX_INSTALL_PKGDATADIR\\}")
-                   (string-append (assoc-ref outputs "out")
-                                  "/share/fcitx5"))))
-              (find-files "." "CMakeLists\\.txt$"))))
          (add-before 'configure 'split-outputs
            ;; Build with GUI supports requires Qt and increase package closure
            ;; by 800M on x86_64, so place it under another output.
-- 
2.29.2