From c9f6938033eaa4ed4b0a4b8209342ea9de839afc Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 3 Oct 2015 17:59:07 +0200 Subject: gnu: liblxqt: Fix download location. * gnu/packages/lxqt.scm (liblxqt)[source]: Use the .tar.xz release exclusively; drop the alternative URI for .tar.gz and correct the hash. --- gnu/packages/lxqt.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages/lxqt.scm') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index e7ed75c77d..064f8c4f81 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -65,13 +65,9 @@ in Qt.") (uri (string-append "https://github.com/lxde/" name "/releases/download/" version "/" name "-" version ".tar.xz")) - (uri - (string-append "https://github.com/lxde/" name "/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0mbl3qc0yfgfsndqrw8vg8k5irsy0pg2wrad8nwv0aphphd4n7rg")) + "0ljdzqavvy82qwwwnhg2bgbshl2ns0k2lcswxlx1cfc8rcdr9w5l")) (patches (map search-patch '("liblxqt-include.patch"))))) (build-system cmake-build-system) (arguments -- cgit 1.4.1 From cfa2e4ad4097947ec393888dc4a95322e1364ba9 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 3 Oct 2015 19:45:06 +0200 Subject: gnu: Add lxqt-common. * gnu/packages/lxqt.scm (lxqt-common): New variable. --- gnu/packages/lxqt.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages/lxqt.scm') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 064f8c4f81..518c63e481 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -81,3 +81,55 @@ in Qt.") (description "liblxqt provides the basic libraries shared by the components of the LxQt desktop environment.") (license lgpl2.1+))) + + +(define-public lxqt-common + (package + (name "lxqt-common") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri + (string-append "http://downloads.lxqt.org/lxqt/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0kbkwmrdjhfbq60wf2yfbsjmci8xlw13ilxxa7yxq68n1aqjqmvf")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-installation-paths + (lambda _ + ;; The variable LXQT_ETC_XDG_DIR is set in + ;; liblxqt-0.9.0/share/cmake/lxqt/lxqt-config.cmake + ;; to the Qt5 installation directory, followed by "/etc/xdg". + ;; We need to have it point to the current installation + ;; directory instead. + (substitute* '("config/CMakeLists.txt" + "menu/CMakeLists.txt") + (("\\$\\{LXQT_ETC_XDG_DIR\\}") + "${CMAKE_INSTALL_PREFIX}/etc/xdg") + ;; In the same file, LXQT_SHARE_DIR is set to the installation + ;; directory of liblxqt, followed by "/share/lxqt". + (("\\$\\{LXQT_SHARE_DIR\\}") + "${CMAKE_INSTALL_PREFIX}/share/lxqt")) + ;; Replace absolute directories. + (substitute* "autostart/CMakeLists.txt" + (("/etc/xdg") + "${CMAKE_INSTALL_PREFIX}/etc/xdg")) + (substitute* "xsession/CMakeLists.txt" + (("/usr/share") + "${CMAKE_INSTALL_PREFIX}/share"))))))) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg))) + (home-page "http://lxqt.org/") + (synopsis "Common files for LXQt") + (description "lxqt-common provides the desktop integration files +(themes, icons, configuration files etc.) for the LXQt +desktop environment.") + (license lgpl2.1+))) -- cgit 1.4.1 From 54033a4db61fc76b15f0654ad4b33ac0d7d6a47f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 3 Oct 2015 21:20:41 +0200 Subject: gnu: Add lxqt-session. * gnu/packages/lxqt.scm (lxqt-session): New variable. --- gnu/packages/lxqt.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/lxqt.scm') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 518c63e481..e6f8753aa0 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -133,3 +133,45 @@ components of the LxQt desktop environment.") (themes, icons, configuration files etc.) for the LXQt desktop environment.") (license lgpl2.1+))) + +(define-public lxqt-session + (package + (name "lxqt-session") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri + (string-append "http://downloads.lxqt.org/lxqt/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "01hxand1gqbcaw14lh7z6w5zssgfaffcjncv752c2c7272wzyhy5")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("kwindowsystem" ,kwindowsystem) + ("liblxqt" ,liblxqt) + ("libqtxdg" ,libqtxdg))) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-installation-paths + (lambda _ + ;; The variable LXQT_TRANSLATIONS_DIR is set in + ;; liblxqt-0.9.0/share/cmake/lxqt/lxqt-config.cmake + ;; to the liblxqt installation directory, followed by + ;; "/share/lxqt/translations". + ;; We need to have it point to the current installation + ;; directory instead. + (substitute* '("lxqt-session/CMakeLists.txt" + "lxqt-config-session/CMakeLists.txt") + (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") + "${CMAKE_INSTALL_PREFIX}/share/lxqt/translations"))))))) + (home-page "http://lxqt.org/") + (synopsis "Session manager for LXQt") + (description "lxqt-session provides the standard session manager +for the LXQt desktop environment.") + (license lgpl2.1+))) -- cgit 1.4.1 From 250ffe4de1186faab65b8eb35d85ec6a2ca0c099 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 3 Oct 2015 22:41:59 +0200 Subject: gnu: liblxqt: Fix download location. * gnu/packages/lxqt.scm (liblxqt)[source]: Fix download location. [description]: Fix typo. --- gnu/packages/lxqt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/lxqt.scm') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index e6f8753aa0..5e90cf81ee 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -63,8 +63,8 @@ in Qt.") (origin (method url-fetch) (uri - (string-append "https://github.com/lxde/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) + (string-append "http://downloads.lxqt.org/lxqt/" version "/" + name "-" version ".tar.xz")) (sha256 (base32 "0ljdzqavvy82qwwwnhg2bgbshl2ns0k2lcswxlx1cfc8rcdr9w5l")) @@ -79,7 +79,7 @@ in Qt.") (home-page "http://lxqt.org/") (synopsis "Core utility library for all LXQt components") (description "liblxqt provides the basic libraries shared by the -components of the LxQt desktop environment.") +components of the LXQt desktop environment.") (license lgpl2.1+))) -- cgit 1.4.1 From f8822418f1d93e73c3b1431d0d4d1b1f2ea5c213 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 3 Oct 2015 22:49:12 +0200 Subject: gnu: libqtxdg: Fix download location. * gnu/packages/lxqt.scm (libqtxdg)[source]: Fix download location. --- gnu/packages/lxqt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lxqt.scm') diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 5e90cf81ee..d840ff0098 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -36,8 +36,8 @@ (origin (method url-fetch) (uri - (string-append "https://github.com/lxde/" name "/releases/download/" - version "/" name "-" version ".tar.xz")) + (string-append "http://downloads.lxqt.org/libqtxdg/" version "/" + name "-" version ".tar.xz")) (sha256 (base32 "1ncqs0lcll5nx69hxfg33m3jfkryjqrjhr2kdci0b8pyaqdv1jc8")))) -- cgit 1.4.1