guix: remove xcb libs

diff --git a/contrib/depends/packages/libXau.mk b/contrib/depends/packages/libXau.mk
index 59a117b4801cc1d3708d2e18d28d28ac956d5903..cc220bd2204cd7c3226b78c3bb0dc359ed212308 100644 (file)
--- a/contrib/depends/packages/libXau.mk
+++ b/contrib/depends/packages/libXau.mk
@@ -31,3 +31,7 @@ endef
 define $(package)_stage_cmds
   DESTDIR=$($(package)_staging_dir) ninja -C build install
 endef
+
+define $(package)_postprocess_cmds
+  sed -i 's/Requires: xproto//g' lib/pkgconfig/xau.pc
+endef

diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk
index 410cf7b06e7979b53b0e9377ff01c2c38e6a7a8c..89164040253b4058625b76384c37a07cf8def4cc 100644 (file)
--- a/contrib/depends/packages/native_qt.mk
+++ b/contrib/depends/packages/native_qt.mk
@@ -166,7 +166,6 @@ define $(package)_config_cmds
   export PKG_CONFIG_LIBDIR=$(build_prefix)/lib/pkgconfig && \
   export QT_MAC_SDK_NO_VERSION_CHECK=1 && \
   unset CMAKE_PREFIX_PATH && \
-  export CMAKE_PREFIX_PATH="$(QT_LIBS)" && \
   cd qtbase && \
   ./configure -top-level $($(package)_config_opts)
 endef

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 21879f48a03165e00dab656b0217eb427209022b..3c5182e6ee76099093e9870bb7cf1386a08795fb 100755 (executable)
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -83,8 +83,6 @@ store_path() {
 # includes/libs
 NATIVE_GCC="$(store_path gcc-toolchain)"
 NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
-QT_LIBS="$(store_path xcb-util):$(store_path xcb-util-renderutil):$(store_path xcb-util-keysyms):$(store_path xcb-util-cursor):$(store_path xcb-util-image):$(store_path xcb-util-wm):"
-QT_LIBS_LIBS="$(echo "${QT_LIBS}" | sed 's/:/\/lib:/g')"
 
 unset LIBRARY_PATH
 unset CPATH
@@ -98,8 +96,6 @@ export C_INCLUDE_PATH="${NATIVE_GCC}/include"
 export CPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
 export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include"
 export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
-export QT_LIBS
-export QT_LIBS_LIBS
 
 prepend_to_search_env_var() {
     export "${1}=${2}${!1:+:}${!1}"

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 538ba8a165d8d6c4e9a9ee07e6f381e0b887a45c..b9f29112657bd23be1251e05e33fee1f22a8f552 100644 (file)
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -487,15 +487,6 @@ inspecting signatures in Mach-O binaries.")
 
         ;; Git
         git-minimal ; used to create the release source archive
-
-        ;; Xcb
-        ;; needed to build native_qt in depends
-        xcb-util
-        xcb-util-cursor
-        xcb-util-image
-        xcb-util-keysyms
-        xcb-util-renderutil
-        xcb-util-wm
     )
   (let ((target (getenv "HOST")))
     (cond ((string-contains target "-mingw32")