Merge branch 'main' into sessions

Author: binarypie

build_files/hypercube/99-tests.sh

@@ -19,6 +19,7 @@ REQUIRED_PACKAGES=(
   "quickshell"
   # Terminals
   "ghostty"
+  "zellij"
   # Dev tools
   "neovim"
   "lazygit"
@@ -48,8 +49,6 @@ REQUIRED_FILES=(
   # Config files
   "/etc/fish/config.fish"
   "/etc/zellij/config.kdl"
-  # zellij ships as a static binary (not an rpm), so check the file directly
-  "/usr/bin/zellij"
   "/usr/share/hypercube/config/starship/starship.toml"
   # Theming
   "/usr/share/themes/Tokyonight-Dark/gtk-3.0/gtk.css"

build_files/hyprland/01-hyprland-desktop.sh

@@ -56,21 +56,10 @@ dnf5 -y install \
 ### Fish Shell (set as default)
 dnf5 -y install fish
 
-### Terminal multiplexer - zellij
-# zellij isn't packaged in the ublue/Fedora repos (`dnf install zellij` ->
-# "No match"), so install the official static musl binary. The base image is
-# amd64-only (no platform matrix in build.yml), so x86_64 is sufficient. Pinned
-# for reproducibility. Gives the host the same Ctrl+Space multiplexer keymap
-# (installed to /etc/zellij/config.kdl by 03-hypercube-configs.sh) as devcube.
-#
-# TODO(#198): a COPR spec now exists at packages/zellij/zellij.spec. Once the
-# `zellij` package is configured + built in the binarypie/hypercube COPR (already
-# enabled in base/01-base-system.sh), replace this block with `dnf5 -y install
-# zellij` and move the test in hypercube/99-tests.sh back to REQUIRED_PACKAGES.
-ZELLIJ_VERSION=0.44.3
-curl -fsSL "https://github.com/zellij-org/zellij/releases/download/v${ZELLIJ_VERSION}/zellij-x86_64-unknown-linux-musl.tar.gz" \
-  | tar -xz -C /usr/bin zellij
-chmod 0755 /usr/bin/zellij
+### Terminal multiplexer - zellij (from Hypercube COPR)
+# Gives the host the same Ctrl+Space multiplexer keymap (installed to
+# /etc/zellij/config.kdl by 03-hypercube-configs.sh) as devcube.
+dnf5 -y install zellij
 
 ### Terminal - Ghostty (from scottames COPR)
 dnf5 -y copr enable scottames/ghostty

packages/zellij/zellij.spec

@@ -5,7 +5,7 @@
 
 Name:           zellij
 Version:        0.44.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A terminal workspace and multiplexer
 
 License:        MIT
@@ -38,6 +38,14 @@ export RUSTUP_HOME=%{_builddir}/.rustup
 export CARGO_HOME=%{_builddir}/.cargo
 export PATH="${CARGO_HOME}/bin:${PATH}"
 
+# Link against the chroot's system OpenSSL (pulled in via BuildRequires:
+# pkgconfig(openssl)) instead of letting the openssl-sys crate vendor and
+# compile its own copy. The vendored build runs OpenSSL's ./Configure, whose
+# perl needs FindBin.pm — not present in the minimal mock chroot — so it fails
+# with "Can't locate FindBin.pm in @INC". Using the system lib also skips
+# compiling OpenSSL from source entirely, which is faster.
+export OPENSSL_NO_VENDOR=1
+
 # Read the Rust channel this release pins (rust-toolchain.toml, currently
 # "1.92.0") and install exactly that with rustup. Reading it from the source
 # tree means bumping Version above is all it takes to follow a new zellij — the
@@ -75,6 +83,11 @@ mkdir -p %{buildroot}%{_datadir}/fish/vendor_completions.d
 %{_datadir}/fish/vendor_completions.d/%{name}.fish
 
 %changelog
+* Sun Jun 28 2026 Hypercube <hypercube@binarypie.dev> - 0.44.3-2
+- Set OPENSSL_NO_VENDOR=1 so openssl-sys links the chroot's system OpenSSL
+  instead of vendoring its own copy, which failed to configure (missing
+  perl FindBin.pm in the minimal mock chroot)
+
 * Wed Jun 24 2026 Hypercube <hypercube@binarypie.dev> - 0.44.3-1
 - Initial package for Hypercube
 - Build with rustup-managed toolchain (per upstream rust-toolchain.toml) so the

scripts/packages/config.sh

@@ -35,6 +35,7 @@ declare -gA PACKAGE_REPOS=(
     [lazyjournal]="Lifailon/lazyjournal"
     [lazysql]="jorgerojas26/lazysql"
     [resterm]="unkn0wn-root/resterm"
+    [zellij]="zellij-org/zellij"
 
     # Other
     [glaze]="stephenberry/glaze"
@@ -73,6 +74,7 @@ declare -gA PACKAGE_DEPS=(
     [lazyjournal]=""
     [lazysql]=""
     [resterm]=""
+    [zellij]=""
     [lua55]=""
 
     # Packages with dependencies
@@ -93,7 +95,7 @@ declare -gA PACKAGE_DEPS=(
 
 # Build batches (packages in same batch can build in parallel)
 declare -gA BUILD_BATCHES=(
-    [1]="hyprutils hyprwayland-scanner hyprland-protocols hyprwire glaze uwsm eza starship lazygit quickshell livesys-scripts wifitui resvg yazi bluetui iamb meli lazyjournal lazysql resterm lua55"
+    [1]="hyprutils hyprwayland-scanner hyprland-protocols hyprwire glaze uwsm eza starship lazygit quickshell livesys-scripts wifitui resvg yazi bluetui iamb meli lazyjournal lazysql resterm zellij lua55"
     [2]="hyprlang hyprgraphics aquamarine"
     [3]="hyprcursor hyprland-qt-support"
     [4]="hyprland hyprlock hypridle xdg-desktop-portal-hyprland hyprpolkitagent hyprtoolkit"