diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/ryan-config/base-system.scm | 2 | ||||
-rw-r--r-- | modules/ryan-packages/freedesktop.scm | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm index 9273e17..f0c8e03 100644 --- a/modules/ryan-config/base-system.scm +++ b/modules/ryan-config/base-system.scm | |||
@@ -141,7 +141,7 @@ | |||
141 | "wireplumber" | 141 | "wireplumber" |
142 | "wireshark" | 142 | "wireshark" |
143 | "zsh")) | 143 | "zsh")) |
144 | (list my-ca-certs swaylock-effects-new waybar-new xdg-desktop-portal-hyprland hyprland-share-picker) | 144 | (list my-ca-certs swaylock-effects-new waybar-new xdg-desktop-portal-hyprland) |
145 | %my-base-packages )) | 145 | %my-base-packages )) |
146 | 146 | ||
147 | ;; Below is the list of system services. To search for available | 147 | ;; Below is the list of system services. To search for available |
diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm index 1ab446b..6e13d53 100644 --- a/modules/ryan-packages/freedesktop.scm +++ b/modules/ryan-packages/freedesktop.scm | |||
@@ -10,6 +10,7 @@ | |||
10 | #:use-module (gnu packages) | 10 | #:use-module (gnu packages) |
11 | #:use-module (gnu packages gl) | 11 | #:use-module (gnu packages gl) |
12 | #:use-module (gnu packages linux) | 12 | #:use-module (gnu packages linux) |
13 | #:use-module (gnu packages image) | ||
13 | #:use-module (gnu packages qt) | 14 | #:use-module (gnu packages qt) |
14 | #:use-module (gnu packages cmake) | 15 | #:use-module (gnu packages cmake) |
15 | #:use-module (gnu packages pkg-config) | 16 | #:use-module (gnu packages pkg-config) |
@@ -71,7 +72,7 @@ | |||
71 | #:inputs inputs | 72 | #:inputs inputs |
72 | #:outputs outputs | 73 | #:outputs outputs |
73 | #:configure-flags '() | 74 | #:configure-flags '() |
74 | #:qtbase #$(this-package-native-input "qtbase")))) | 75 | #:qtbase #$(this-package-native-input "qtbase-5")))) |
75 | (add-after 'qt-build 'qt-install | 76 | (add-after 'qt-build 'qt-install |
76 | (lambda* (#:key inputs outputs #:allow-other-keys) | 77 | (lambda* (#:key inputs outputs #:allow-other-keys) |
77 | (let ((share-picker (string-append (assoc-ref outputs "out") | 78 | (let ((share-picker (string-append (assoc-ref outputs "out") |
@@ -79,9 +80,18 @@ | |||
79 | (install-file "build/hyprland-share-picker" share-picker) | 80 | (install-file "build/hyprland-share-picker" share-picker) |
80 | #t))) | 81 | #t))) |
81 | (add-after 'qt-install 'qt-wrap | 82 | (add-after 'qt-install 'qt-wrap |
82 | (assoc-ref qt:%standard-phases 'qt-wrap))))) | 83 | (assoc-ref qt:%standard-phases 'qt-wrap)) |
83 | (native-inputs (list cmake pkg-config qtbase)) | 84 | (add-after 'qt-wrap 'dep-wrap |
84 | (inputs (list elogind hyprland hyprland-protocols pipewire wayland-protocols wayland libinih mesa qtwayland `(,util-linux "lib"))) | 85 | (lambda* (#:key inputs #:allow-other-keys) |
86 | (let ((hyprland-share-picker (string-append #$output "/bin/hyprland-share-picker"))) | ||
87 | (wrap-program hyprland-share-picker | ||
88 | `("PATH" suffix | ||
89 | ,(map (lambda (program) | ||
90 | (dirname (search-input-file | ||
91 | inputs (string-append "/bin/" program)))) | ||
92 | '("slurp")))))))))) | ||
93 | (native-inputs (list cmake pkg-config qtbase-5)) | ||
94 | (inputs (list elogind hyprland hyprland-protocols slurp pipewire wayland-protocols wayland libinih mesa qtwayland-5 `(,util-linux "lib"))) | ||
85 | (home-page "") | 95 | (home-page "") |
86 | (synopsis "test") | 96 | (synopsis "test") |
87 | (description "test") | 97 | (description "test") |