From 9264265c7b1086a7fb946c7a4f630a204bd0c503 Mon Sep 17 00:00:00 2001
From: Kimapr <kimapr.fr@gmail.com>
Date: Sat, 12 Apr 2025 12:53:18 +0500
Subject: [PATCH] fix everything

---
 guix/build-self.scm          |  2 -
 kimapr/packages/override.scm | 78 ++++++++++++++++++++++++++----------
 2 files changed, 57 insertions(+), 23 deletions(-)
 delete mode 100644 guix/build-self.scm

diff --git a/guix/build-self.scm b/guix/build-self.scm
deleted file mode 100644
index b3025e4..0000000
--- a/guix/build-self.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-(define-module (guix build-self))
-; erm.
diff --git a/kimapr/packages/override.scm b/kimapr/packages/override.scm
index a54435a..d9ffc76 100644
--- a/kimapr/packages/override.scm
+++ b/kimapr/packages/override.scm
@@ -2,41 +2,77 @@
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix packages)
+  #:use-module ((gnu packages base)
+                #:prefix gnu:)
   #: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))
+  #:replace (lua-5.4 ffmpeg-7 ffmpeg))
+
+(define rewrite-rules
+  '())
+
+(define (add-rewrite old new)
+  (set! rewrite-rules
+        (cons `(,old unquote new) rewrite-rules)) new)
 
 ;; 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")))))))
+  (add-rewrite gnu: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)))))
+  (add-rewrite 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))
+(define-public (unpropagate-inputs pkg)
+  (package
+    (inherit pkg)
+    (inputs (append (package-inputs pkg)
+                    (package-propagated-inputs pkg)))
+    (propagated-inputs '())))
+
+(define-public mpv-noprop-gnu
+  (unpropagate-inputs gnu:mpv))
+
+(define-public (specs/pkgs->pkgs pkgs)
+  (map (lambda (x)
+         (if (string? x)
+             (specification->package x) x)) pkgs))
+
+(define-public (unfuck-packages pkgs)
+  ;; kind of a hack but i'm laziggy
+  ;; P.S. this too ktoo much work to debug goddamn i shoud ve done somehting less sus amongus
+  (map (lambda (x)
+         (if (string? (car x))
+             (let ((y (cdr x)))
+               (if (pair? (cdr y)) y
+                   (car y))) x))
+       (package-inputs ((package-input-rewriting rewrite-rules)
+                        (package
+                          (inherit gnu:hello)
+                          (inputs pkgs))))))