gt gtk styling

1 files changed, 108 insertions, 25 deletions

diff --git a/modules/freya/packages/qt.scm b/modules/freya/packages/qt.scm
index 2971432..ca689b9 100644
--- a/modules/freya/packages/qt.scm
+++ b/modules/freya/packages/qt.scm
@@ -1,28 +1,111 @@
 (define-module (freya packages qt)
-	#:use-module (guix packages)
-	#:use-module (guix download)
-	#:use-module (guix build-system gnu)
-	#:use-module ((guix licenses) #:prefix license:)
-	#:use-module (guix utils)
-	#:use-module (gnu packages node))
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages qt))
 
-;(define-public qt5-styleplugins
-;  (let ((commit "7bd6205398b2d89b3ac083b2f6f00b197f40057a")
-;		(revision "1"))
-;	(package
-;	  (name "qt5-styleplugins")
-;	  (version (git-version "5.0.0" revision commit))
-;	  (source (origin
-;				(method git-fetch)
-;				(uri (git-reference
-;					   (url "https://github.com/qt/qtstyleplugins")
-;					   (commit commit)))
-;				(patches (list
-;						   (local-file "patches/qt5-styleplugins-fix-gtk2-background.patch")
-;						   (local-file "patches/qt5-styleplugins-fixbuild-against-QT-5.15.patch")))
-;				(file-name (git-file-name name version))
-;                (sha256
-;                 (base32
-;                  "0gy0g0kxb3q1wjqrypnvmrxcb4ld3advikchygpwpfp4s9v0mmvd"))))
-;	  (build-system meson-build-system)
+(define-public qt5-styleplugins
+  (let ((commit "7bd6205398b2d89b3ac083b2f6f00b197f40057a")
+    (revision "1"))
+  (package
+    (name "qt5-styleplugins")
+    (version (git-version "5.0.0" revision commit))
+    (source (origin
+        (method git-fetch)
+        (uri (git-reference
+             (url "https://github.com/qt/qtstyleplugins")
+             (commit commit)))
+        (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0pi30l6g8bk1z83n6q6khjcm789szzz52aq1r9va6285i5j8ykac"))))
+    (build-system gnu-build-system)
+    (arguments
+    `(#:phases (modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out")))
+                (invoke "qmake"
+                  (string-append "prefix=" out)))))
+          (replace 'install
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                  (qt5 (assoc-ref inputs "qtbase")))
+                (invoke "make" (string-append "INSTALL_ROOT=\"" out "\"") "install")
+                (let ((lib (string-append out qt5 "/lib")))
+                  (invoke "mv" lib out)
+                  (invoke "rm" "-fr" (string-append out "/gnu"))))))
+          )))
+    (native-inputs
+    (list qttools-5
+        findutils
+        coreutils))
+    (inputs
+    (list qtbase-5))
+    (home-page "")
+    (synopsis "")
+    (description "")
+    (license license:expat))))
 
+
+(define-public qt6gtk2
+  (package
+    (name "qt6gtk2")
+    (version "0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/trialuser02/qt6gtk2"
+                                  "/archive/refs/tags/" version ".tar.gz"))
+              (sha256
+               (base32
+                  "133f8ax1clbsc4ppdibfjcfz38153rznplp1sgfcrfi7bkgrm00c"))))
+    (build-system gnu-build-system)
+    (arguments
+    `(#:phases (modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+					(gtk2 (assoc-ref inputs "gtk+"))
+					(x11 (assoc-ref inputs "libx11")))
+				(substitute* "qt6gtk2.pri"
+					(("UI_DIR") (string-append
+								  "PKG_CONFIG = "
+								  (assoc-ref inputs "pkg-config")
+								  "/bin/pkg-config"
+								  "\nPKG_CONFIG_PATH = "
+								  gtk2 "/include" ":" x11 "/include"
+								  "\nUI_DIR")))
+                (invoke "qmake"
+                  (string-append "prefix=" out))
+				)))
+          (replace 'install
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                  (qt5 (assoc-ref inputs "qtbase")))
+                (invoke "make" (string-append "INSTALL_ROOT=\"" out "\"") "install")
+                (let ((lib (string-append out qt5 "/lib")))
+                  (invoke "mv" lib out)
+                  (invoke "rm" "-fr" (string-append out "/gnu"))))))
+          )))
+    (native-inputs
+      (list pkg-config
+			qttools
+            coreutils))
+    (inputs
+      (list qtbase
+            gtk+-2
+			libx11
+			libxkbcommon))
+    (home-page "")
+    (synopsis "")
+    (description "")
+    (license license:expat)))