diff options
| -rw-r--r-- | sigils/packages/admin.scm | 2 | ||||
| -rw-r--r-- | sigils/packages/minecraft.scm | 31 | ||||
| -rw-r--r-- | sigils/packages/qt.scm | 43 | ||||
| -rw-r--r-- | sigils/packages/xmpp.scm | 45 |
4 files changed, 86 insertions, 35 deletions
diff --git a/sigils/packages/admin.scm b/sigils/packages/admin.scm index eb4db36..d286b13 100644 --- a/sigils/packages/admin.scm +++ b/sigils/packages/admin.scm @@ -41,7 +41,7 @@ libxinerama libxrandr)) (arguments - `(#:make-flags (list ,(string-append "CC=" (cc-for-target))) + `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) #:tests? #f ;no check target #:phases (modify-phases %standard-phases (delete 'configure)))) diff --git a/sigils/packages/minecraft.scm b/sigils/packages/minecraft.scm index 4925aa6..921c9b2 100644 --- a/sigils/packages/minecraft.scm +++ b/sigils/packages/minecraft.scm @@ -20,37 +20,6 @@ ;;; FjordLauncher -(define-public qt6ct - (package - (inherit qt5ct) - (name "qt6ct") - (version "0.9") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/trialuser02/qt6ct/archive/refs/tags/" version - ".tar.gz")) - (sha256 - (base32 "0vl2x3livyik5mf8qg4zpkxx9zd1nglxxj6rgjadcbd8a7xw8jda")))) - (native-inputs (list qttools libxkbcommon vulkan-headers)) - (inputs (list qtsvg qtbase)) - (arguments - (list - #:tests? #f ;No target - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* '("src/qt6ct-qtplugin/CMakeLists.txt" - "src/qt6ct-style/CMakeLists.txt") - (("\\$\\{PLUGINDIR\\}") - (string-append #$output "/lib/qt6/plugins")))))))) - (synopsis "Qt6 Configuration Tool") - (description - "Qt6CT is a program that allows users to configure Qt6 settings (such -as icons, themes, and fonts) in desktop environments or -+ window managers, that don't provide Qt integration by themselves."))) - (define with-qt6 (package-mapping (lambda (p) (package diff --git a/sigils/packages/qt.scm b/sigils/packages/qt.scm new file mode 100644 index 0000000..1e4ee79 --- /dev/null +++ b/sigils/packages/qt.scm @@ -0,0 +1,43 @@ +(define-module (sigils packages qt) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module ((guix licenses) + #:prefix license:) + ;; qt6ct + #:use-module (gnu packages qt) + #:use-module (gnu packages vulkan) + #:use-module (gnu packages xdisorg)) + +;; Qt6Ct + +(define-public qt6ct + (package + (inherit qt5ct) + (name "qt6ct") + (version "0.9") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/trialuser02/qt6ct/archive/refs/tags/" version + ".tar.gz")) + (sha256 + (base32 "0vl2x3livyik5mf8qg4zpkxx9zd1nglxxj6rgjadcbd8a7xw8jda")))) + (native-inputs (list qttools libxkbcommon vulkan-headers)) + (inputs (list qtsvg qtbase)) + (arguments + (list + #:tests? #f ;No target + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* '("src/qt6ct-qtplugin/CMakeLists.txt" + "src/qt6ct-style/CMakeLists.txt") + (("\\$\\{PLUGINDIR\\}") + (string-append #$output "/lib/qt6/plugins")))))))) + (synopsis "Qt6 Configuration Tool") + (description + "Qt6CT is a program that allows users to configure Qt6 settings (such +as icons, themes, and fonts) in desktop environments or ++ window managers, that don't provide Qt integration by themselves."))) diff --git a/sigils/packages/xmpp.scm b/sigils/packages/xmpp.scm index 66cf317..b4c1a45 100644 --- a/sigils/packages/xmpp.scm +++ b/sigils/packages/xmpp.scm @@ -4,11 +4,11 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix git-download) - #:use-module (guix build-system pyproject) - #:use-module (guix build-system python) #:use-module ((guix licenses) #:prefix license:) ;; gajim + #:use-module (guix build-system pyproject) + #:use-module (guix build-system python) #:use-module (gnu packages gettext) #:use-module (gnu packages avahi) #:use-module (gnu packages glib) @@ -21,7 +21,11 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages protobuf)) + #:use-module (gnu packages protobuf) + ;; Psimedia + #:use-module (guix build-system qt) + #:use-module (gnu packages glib) + #:use-module (gnu packages pkg-config)) ;; (define-public chatty-gnome ;; (package @@ -39,6 +43,41 @@ ;; (append cmatrix))))) +;;; Psimedia + +(define-public psimedia + (let ((commit "478567ee3312b163eebd821b2081daa3c6158c14") + (revision "1")) + (package + (name "psimedia") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/psi-im/psimedia") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pskjwdd8862hfncivk1hv42y4mscr5ycj2jiqaxpwi8w4106p4s")))) + (build-system qt-build-system) + (native-inputs (list pkgconf)) + (inputs (list glib + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-good-qt)) + (arguments + '(#:configure-flags + '("-DUSE_PSI=OFF" "-DBUILD_DEMO=OFF") + #:tests? #f)) + (home-page "https://github.com/psi-im/psimedia") + (synopsis "Abstraction layer over GStreamer") + (description "PsiMedia is a thick abstraction layer for providing audio and video RTP services to Psi-like IM clients. The implementation is based on GStreamer.") + (license license:lgpl2.1)))) + + ;;; Gajim (define-public python-protobuf |