From 014c90517b38e855b89ec1e557cb7e08f239c93f Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Thu, 29 Feb 2024 15:55:10 -0500
Subject: updated channels, added kanshi, fixed xdph, fixed firefox to not
 rebuild

---
 modules/ryan-packages/freedesktop.scm | 25 ++-----------------------
 modules/ryan-packages/mozilla.scm     |  2 +-
 2 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'modules/ryan-packages')

diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm
index add4a6d..56b5633 100644
--- a/modules/ryan-packages/freedesktop.scm
+++ b/modules/ryan-packages/freedesktop.scm
@@ -59,6 +59,7 @@
       (list
         #:tests? #f
         #:configure-flags #~(list "-Dsystemd=disabled")
+        #:qtbase qtbase
         #:phases
         ;; After building the portal, we need to build the share selector using qt
         #~(modify-phases %standard-phases
@@ -71,7 +72,7 @@
                                       (("\\<(hyprctl-share-picker)\\>" _ cmd)
                                        (string-append #$output "/bin/" cmd))))))))
     (native-inputs (list gcc-13 pkg-config wayland hyprlang))
-    (inputs (list bash-minimal grim hyprland hyprland-protocols mesa pipewire qtbase sdbus-c++ slurp wayland-protocols qtwayland))
+    (inputs (list bash-minimal grim hyprland hyprland-protocols mesa pipewire sdbus-c++ slurp wayland-protocols qtwayland))
     (home-page "")
     (synopsis "test")
     (description "test")
@@ -140,28 +141,6 @@
     (description "test")
     (license license:bsd-3)))
 
-(define-public hyprlang
-  (package
-    (name "hyprlang")
-    (version "0.3.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/hyprwm/hyprlang")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-                (base32
-                  "1sxr7whzjamjg9pcvpbxniwph5p3yy2qs87n91zqwb5y9z3gfd7m"))))
-    (build-system cmake-build-system)
-    (native-inputs
-      (list gcc-13))
-    (home-page "")
-    (synopsis "test")
-    (description "test")
-    (license license:gpl3)))
-
-
 (define-public wl-mirror
   (package
     (name "wl-mirror")
diff --git a/modules/ryan-packages/mozilla.scm b/modules/ryan-packages/mozilla.scm
index 8959b07..0a16014 100644
--- a/modules/ryan-packages/mozilla.scm
+++ b/modules/ryan-packages/mozilla.scm
@@ -26,7 +26,7 @@
     (inputs
      `(("bash" ,bash-minimal)
        ("pipewire" ,pipewire)
-       ("firefox" ,firefox*)))
+       ("firefox" ,firefox)))
     (build-system trivial-build-system)
     (arguments
      '(#:modules ((guix build utils))
-- 
cgit v1.2.3