summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2022-10-25 23:39:14 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2022-10-26 00:05:10 +0200
commitd064b4704d9939e089319fc893243669900f2982 (patch)
treebeb5d72493ec0acf588d448b800e77509984395f
parentfdb2aa0d751deb91a7f0de839d586ea525999fc0 (diff)
Minimize gtk to not let qt dependencies slip through
-rw-r--r--disfluid/maintainer/channel-code.scm30
1 files changed, 29 insertions, 1 deletions
diff --git a/disfluid/maintainer/channel-code.scm b/disfluid/maintainer/channel-code.scm
index 725f7ef..bc45356 100644
--- a/disfluid/maintainer/channel-code.scm
+++ b/disfluid/maintainer/channel-code.scm
@@ -66,6 +66,8 @@
(guix scripts pack)
(guix gexp)
(guix modules)
+ (guix utils)
+ (ice-9 match)
,@modules)))))
(define (fix-source _)
`(source
@@ -113,7 +115,7 @@
'(guile-hall emacs gnu-gettext autoconf-archive
findutils tzdata-for-tests)))
(define (fix-runtime-inputs inputs)
- (fix-inputs 'inputs inputs '(glib gtk bash-minimal)))
+ (fix-inputs 'inputs inputs '(glib gtk-minimal bash-minimal)))
(define (fix-propagated-inputs inputs)
(fix-inputs 'propagated-inputs inputs '()))
(define fix-field
@@ -151,6 +153,26 @@
(fix-use-modules modules))
(`(package . ,fields)
(fix-package fields))))
+ (define package-fixes
+ `(define gtk-minimal
+ (package
+ (inherit gtk)
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments gtk)
+ ((#:configure-flags configure-flags (,(string->symbol "gexp") list))
+ (,(string->symbol "gexp")
+ (append
+ (,(string->symbol "ungexp") configure-flags)
+ (list
+ "-Dmedia-gstreamer=disabled"))))))
+ (inputs
+ (filter
+ (match-lambda
+ (("gst-plugins-bad" . _) #f)
+ (("gst-plugins-base" . _) #f)
+ (else #t))
+ (package-inputs gtk))))))
(call-with-input-file
#$(guix.scm scan)
(lambda (base)
@@ -162,6 +184,12 @@
(let ((next (read base)))
(unless (eof-object? next)
(begin
+ ((@ (ice-9 match) match) next
+ (('package . _)
+ ;; Also fix the packages
+ (pretty-print package-fixes inherited)
+ (newline inherited))
+ (else #t))
(pretty-print (fix-object next) inherited)
(newline inherited)
(loop)))))