diff options
author | Ryan Schanzenbacher <ryan@rschanz.org> | 2023-08-07 23:38:44 -0400 |
---|---|---|
committer | Ryan Schanzenbacher <ryan@rschanz.org> | 2023-08-08 00:03:28 -0400 |
commit | b5d987e6dc8d520469891467d90868db8d6b5dbc (patch) | |
tree | 6392ab2acd09c51dd215dcc3a387e6971423421e /modules/ryan-packages/freedesktop.scm | |
parent | 193d559a191e72ab09b944f596ceb037e5b8bea8 (diff) |
working build! Just need to wrap deps
Diffstat (limited to 'modules/ryan-packages/freedesktop.scm')
-rw-r--r-- | modules/ryan-packages/freedesktop.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm index 6f927f8..1ab446b 100644 --- a/modules/ryan-packages/freedesktop.scm +++ b/modules/ryan-packages/freedesktop.scm | |||
@@ -36,7 +36,7 @@ | |||
36 | (define-public xdg-desktop-portal-hyprland | 36 | (define-public xdg-desktop-portal-hyprland |
37 | (package | 37 | (package |
38 | (name "xdg-desktop-portal-hyprland") | 38 | (name "xdg-desktop-portal-hyprland") |
39 | (version "0.4.0") | 39 | (version "0.5.0") |
40 | (source (origin | 40 | (source (origin |
41 | (method git-fetch) | 41 | (method git-fetch) |
42 | (uri (git-reference | 42 | (uri (git-reference |
@@ -45,7 +45,7 @@ | |||
45 | (file-name (git-file-name name version)) | 45 | (file-name (git-file-name name version)) |
46 | (sha256 | 46 | (sha256 |
47 | (base32 | 47 | (base32 |
48 | "1dcglmx02j73qbmw9qsacamn8byakyzwknpqjnhsyphixb4crrdg")))) | 48 | "1dmgc0w4wjj9hwqg17wg529v8sbxr6czp9s319d5407jm780x40b")))) |
49 | (build-system meson-build-system) | 49 | (build-system meson-build-system) |
50 | (arguments | 50 | (arguments |
51 | (list | 51 | (list |
@@ -65,17 +65,19 @@ | |||
65 | (lambda _ (chdir "../source/hyprland-share-picker/"))) | 65 | (lambda _ (chdir "../source/hyprland-share-picker/"))) |
66 | (add-after 'chdir 'check-setup | 66 | (add-after 'chdir 'check-setup |
67 | (assoc-ref qt:%standard-phases 'check-setup)) | 67 | (assoc-ref qt:%standard-phases 'check-setup)) |
68 | (add-after 'check-setup 'qt-build-new | 68 | (add-after 'check-setup 'qt-build |
69 | (lambda* (#:key inputs outputs #:allow-other-keys) | 69 | (lambda* (#:key inputs outputs #:allow-other-keys) |
70 | ((assoc-ref qt:%standard-phases 'build) | 70 | ((assoc-ref qt:%standard-phases 'build) |
71 | #:inputs inputs | 71 | #:inputs inputs |
72 | #:outputs outputs | 72 | #:outputs outputs |
73 | #:configure-flags '() | 73 | #:configure-flags '() |
74 | ;#:qtbase (let ((module (resolve-interface '(gnu packages qt))))(module-ref module 'qtbase))))) <--- This results in no code for module (gnu packages qt) | ||
75 | #:qtbase #$(this-package-native-input "qtbase")))) | 74 | #:qtbase #$(this-package-native-input "qtbase")))) |
76 | ;))) | ||
77 | (add-after 'qt-build 'qt-install | 75 | (add-after 'qt-build 'qt-install |
78 | (assoc-ref qt:%standard-phases 'install)) | 76 | (lambda* (#:key inputs outputs #:allow-other-keys) |
77 | (let ((share-picker (string-append (assoc-ref outputs "out") | ||
78 | "/bin"))) | ||
79 | (install-file "build/hyprland-share-picker" share-picker) | ||
80 | #t))) | ||
79 | (add-after 'qt-install 'qt-wrap | 81 | (add-after 'qt-install 'qt-wrap |
80 | (assoc-ref qt:%standard-phases 'qt-wrap))))) | 82 | (assoc-ref qt:%standard-phases 'qt-wrap))))) |
81 | (native-inputs (list cmake pkg-config qtbase)) | 83 | (native-inputs (list cmake pkg-config qtbase)) |