diff --git a/steps-guix/dbus-1.16.2/pass1.sh b/steps-guix/dbus-1.16.2/pass1.sh index f7001a05..3f2e73ec 100644 --- a/steps-guix/dbus-1.16.2/pass1.sh +++ b/steps-guix/dbus-1.16.2/pass1.sh @@ -13,6 +13,9 @@ src_configure() { -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" \ -DCMAKE_INSTALL_INCLUDEDIR="${PREFIX}/include" \ + -DCMAKE_PREFIX_PATH="${PREFIX}" \ + -DCMAKE_INCLUDE_PATH="${PREFIX}/include" \ + -DCMAKE_LIBRARY_PATH="${LIBDIR}:${PREFIX}/lib" \ -DBUILD_SHARED_LIBS=ON \ -DDBUS_BUILD_TESTS=OFF \ -DDBUS_ENABLE_XML_DOCS=OFF \ diff --git a/steps-guix/expat-2.7.4/pass1.sh b/steps-guix/expat-2.7.4/pass1.sh new file mode 100644 index 00000000..d6155146 --- /dev/null +++ b/steps-guix/expat-2.7.4/pass1.sh @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default +} + +src_configure() { + local host_triplet + host_triplet="$(gcc -dumpmachine)" + + PATH="${PREFIX}/bin:/usr/bin:/bin" \ + PKG_CONFIG_PATH="${LIBDIR}/pkgconfig:${PREFIX}/lib/pkgconfig" \ + ./configure \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --includedir="${PREFIX}/include" \ + --host="${host_triplet}" \ + --build="${host_triplet}" \ + --enable-static \ + --enable-shared +} + +src_compile() { + default_src_compile +} + +src_install() { + default_src_install +} diff --git a/steps-guix/expat-2.7.4/sources b/steps-guix/expat-2.7.4/sources new file mode 100644 index 00000000..2a725a00 --- /dev/null +++ b/steps-guix/expat-2.7.4/sources @@ -0,0 +1 @@ +f https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.gz 461ecc8aa98ab1a68c2db788175665d1a4db640dc05bf0e289b6ea17122144ec expat-2.7.4.tar.gz diff --git a/steps-guix/manifest b/steps-guix/manifest index 7f9f1a84..9df562a5 100644 --- a/steps-guix/manifest +++ b/steps-guix/manifest @@ -18,6 +18,7 @@ build: libgpg-error-1.59 build: libgcrypt-1.12.1 build: guile-gcrypt-0.5.0 build: git-2.53.0 +# CMake for libgit2 and DBus build: cmake-4.2.3 build: libgit2-1.9.2 build: nettle-3.10.2 @@ -31,6 +32,7 @@ build: guile-zlib-0.2.2 build: guile-lzlib-0.0.2 build: scheme-bytestructures-2.0.2 build: libevent-2.1.12 +build: expat-2.7.4 build: dbus-1.16.2 build: avahi-0.8 build: guile-avahi-0.4.1