BREAK EVERYTHING

guix/build-self.scm

@@ -0,0 +1,2 @@
+(define-module (guix build-self))
+; erm.

kimapr/packages/misc.scm

@@ -1,11 +1,8 @@
 (define-module (kimapr packages misc)
-  #:use-module (guix gexp)
   #:use-module (guix utils)
+  #:use-module (guix build-system meson)
   #:use-module (guix download)
   #:use-module (guix packages)
-  #:use-module (gnu packages lua)
-  #:use-module (gnu packages video)
-  #:use-module (gnu packages audio)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
@@ -16,9 +13,9 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module ((guix licenses)
-                #:prefix license:)
-  #:export (lua ffmpeg mpv accerciser))
+                #:prefix license:))
 
+(define-public accerciser
   (package
     (name "accerciser")
     (version "3.46.2")
@@ -48,7 +45,8 @@
      '(#:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap-orca
                     (lambda* (#:key outputs #:allow-other-keys)
-                    (wrap-program (search-input-file outputs "bin/accerciser")
+                      (wrap-program (search-input-file outputs
+                                                       "bin/accerciser")
                         `("GI_TYPELIB_PATH" ":" prefix
                           (,(getenv "GI_TYPELIB_PATH")))
                         `("GUIX_PYTHONPATH" ":" prefix
@@ -76,29 +74,4 @@ and automated test frameworks. Accerciser has a simple plugin framework which
 you can use to create custom views of accessibility information.
 
 In essence, Accerciser is a next generation at-poke tool.")
-  (license license:bsd-3))
-
-(define-public lua
-  (package
-    (inherit lua-5.4)
-    (arguments
-     (substitute-keyword-arguments (package-arguments lua-5.4)
-       ((#:make-flags flags)
-        (append (list-head flags
-                           (- (length flags) 1))
-                '("linux-readline")))))))
-
-(define-public ffmpeg
-  (package
-    (inherit ffmpeg)
-    (arguments
-     (substitute-keyword-arguments (package-arguments ffmpeg)
-       ((#:configure-flags flags)
-        #~(cons* "--enable-libopenmpt"
-                 #$flags))))
-    (inputs (modify-inputs (package-inputs ffmpeg)
-              (prepend libopenmpt)))))
-
-(define-public mpv
-  ((package-input-rewriting `((,ffmpeg unquote ffmpeg-mod)))
-   mpv))
+    (license license:bsd-3)))

kimapr/packages/override.scm

@@ -0,0 +1,42 @@
+(define-module (kimapr packages override)
+  #:use-module (guix gexp)
+  #:use-module (guix utils)
+  #:use-module (guix packages)
+  #:use-module ((gnu packages lua)
+                #:prefix gnu:)
+  #:use-module ((gnu packages video)
+                #:prefix gnu:)
+  #:use-module ((gnu packages audio)
+                #:prefix gnu:)
+  #:replace (lua-5.4 ffmpeg-7 ffmpeg mpv))
+
+;; Guix won't merge my patch for this after 1 grillion years
+(define lua-5.4
+  (package
+    (inherit gnu:lua-5.4)
+    (arguments
+     (substitute-keyword-arguments (package-arguments gnu:lua-5.4)
+       ((#:make-flags flags)
+        (append (list-head flags
+                           (- (length flags) 1))
+                '("linux-readline")))))))
+
+(define (unfuck-ffmpeg ffmpeg)
+  (package
+    (inherit ffmpeg)
+    (arguments
+     (substitute-keyword-arguments (package-arguments ffmpeg)
+       ((#:configure-flags flags)
+        #~(cons* "--enable-libopenmpt"
+                 #$flags))))
+    (inputs (modify-inputs (package-inputs ffmpeg)
+              (prepend gnu:libopenmpt)))))
+
+(define ffmpeg-7
+  (unfuck-ffmpeg gnu:ffmpeg-7))
+(define ffmpeg
+  (unfuck-ffmpeg gnu:ffmpeg))
+
+(define mpv
+  ((package-input-rewriting `((,gnu:ffmpeg unquote ffmpeg)))
+   gnu:mpv))