Skip to content

Commit 0d01e77

Browse files
committed
Merge remote-tracking branch 'metacraft-labs/dev' into feat/trace-incremental-testing
2 parents 092c145 + 428b223 commit 0d01e77

3 files changed

Lines changed: 72 additions & 0 deletions

File tree

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## DSL-port M9.R.15q.5.12 — stdlib provisioning stub for ``libxcvt``.
2+
##
3+
## libxcvt is the VESA Coordinated Video Timings library +
4+
## ``libxcvt.pc`` pkg-config file kwin 6.2.5's CMakeLists.txt:340
5+
## probes via ``pkg_check_modules(... libxcvt>=0.1.1 ...)`` for the
6+
## DRM backend's modeline-fallback computation. The sibling ``cvt``
7+
## stub points at the ``bin/cvt`` binary; this stub points at the
8+
## ``lib/libxcvt.so`` library + headers so resolvers consuming the
9+
## library (vs the CLI tool) get the right multi-output channel.
10+
##
11+
## ## Provisioning channel — nixpkgs#libxcvt^*
12+
##
13+
## The ``^*`` suffix realizes ALL outputs (out + dev) so the
14+
## resolver's multi-output walk finds the ``libxcvt.so`` and the
15+
## ``libxcvt.pc`` in the dev output.
16+
17+
import repro_project_dsl
18+
19+
package `libxcvt`:
20+
provisioning:
21+
nixPackage "nixpkgs#libxcvt^*", executablePath = "lib/libxcvt.so",
22+
nixpkgsRev = "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
23+
nixpkgsNarHash = "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8="

libs/repro_dsl_stdlib/src/repro_dsl_stdlib/packages/system_tools.nim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ import ./libdisplayinfo
168168
import ./hwdata
169169
# M9.R.15q.5.7 — attica is the OCS client knewstuff needs.
170170
import ./attica
171+
# M9.R.15q.5.12 — libxcvt is the VESA CVT library kwin's DRM backend
172+
# probes via pkg-config (libxcvt>=0.1.1).
173+
import ./libxcvt
171174

172175
export bc
173176
export bison
@@ -245,3 +248,4 @@ export libepoxy
245248
export libdisplayinfo
246249
export hwdata
247250
export attica
251+
export libxcvt

recipes/packages/source/kwin/repro.nim

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,51 @@ package kwinSource:
313313
"kauth >=6.0"
314314
"kcolorscheme >=6.0"
315315
"kidletime >=6.0"
316+
## M9.R.15q.5.11 — kwin 6.2.5's top-level CMakeLists.txt:85 declares
317+
## ``find_package(KF6 ... COMPONENTS ... WindowSystem ...)`` which
318+
## is the always-required KF6 component list (separate from the
319+
## KCMS-gated list at line 104). kwindowsystem is the sibling
320+
## from-source recipe.
321+
"kwindowsystem >=6.0"
322+
## M9.R.15q.5.11 — kwin's CMakeLists.txt also declares Crash +
323+
## DBusAddons + GlobalAccel + GuiAddons + I18n + Service + Svg
324+
## as KF6 components. Add the missing siblings.
325+
"kcrash >=6.0"
326+
"kdbusaddons >=6.0"
327+
"kglobalaccel >=6.0"
328+
"kguiaddons >=6.0"
329+
"ki18n >=6.0"
330+
"kservice >=6.0"
331+
"ksvg >=6.0"
332+
"kconfig >=6.0"
333+
"kcoreaddons >=6.0"
334+
"kwidgetsaddons >=6.0"
335+
## M9.R.15q.5.11.b — kwindowsystem was built with KWINDOWSYSTEM_X11=ON
336+
## so its CMake Config does ``find_dependency(X11)`` at consumer
337+
## time. cmake's ``FindX11`` looks for X11/X.h (xorgproto) + libX11
338+
## + libxcb on the standard system paths; since we're in a
339+
## hermetic nix-shell, we thread the X11 client libs onto kwin's
340+
## env via the M9.R.14e search-path channels (same shape
341+
## kwindowsystem itself uses).
342+
"xorgproto"
343+
"libx11"
344+
"libxcb"
345+
"libxau"
346+
"libxdmcp"
347+
"xcb-util-keysyms"
348+
"xcb-util-wm"
349+
"libxext"
350+
"libxfixes"
351+
"libxrender"
352+
## M9.R.15q.5.12 — kwin 6.2.5's CMakeLists.txt:340 declares
353+
## ``pkg_check_modules(libxcvt>=0.1.1 REQUIRED)`` for the DRM
354+
## backend's modeline-fallback computation. libxcvt is a nix-stub.
355+
"libxcvt"
356+
## M9.R.15q.5.12 — libepoxy.pc declares ``Requires: gl``, so
357+
## pkg-config recursively probes for ``gl.pc`` (libglvnd's desktop
358+
## OpenGL pkg-config file). The ``gl`` nix-stub points at
359+
## ``nixpkgs#libglvnd``'s gl.pc.
360+
"gl"
316361
## M9.R.15q.5.8 — kdeclarative + kcmutils + knewstuff are
317362
## conditionally required ONLY when KWIN_BUILD_KCMS=ON (see kwin
318363
## upstream CMakeLists.txt:104). With KWIN_BUILD_KCMS=OFF (which

0 commit comments

Comments
 (0)