summary refs log tree commit diff
path: root/pkgs/desktops/lxqt/base
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/lxqt/base')
-rw-r--r--pkgs/desktops/lxqt/base/liblxqt/default.nix4
-rw-r--r--pkgs/desktops/lxqt/base/libqtxdg/default.nix10
-rw-r--r--pkgs/desktops/lxqt/base/libsysstat/default.nix4
-rw-r--r--pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix10
4 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
index 9363dba86699..bb5a9be6d848 100644
--- a/pkgs/desktops/lxqt/base/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "liblxqt";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5";
+    sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
index 47d3fb2e91c3..966566db7c8d 100644
--- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
@@ -2,24 +2,28 @@
 
 stdenv.mkDerivation rec {
   name = "libqtxdg-${version}";
-  version = "2.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libqtxdg";
     rev = version;
-    sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy";
+    sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6";
   };
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ qt5.qtbase qt5.qtsvg ];
 
+  preConfigure = ''
+    cmakeFlags+=" -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix"
+  '';
+
   meta = with stdenv.lib; {
     description = "Qt implementation of freedesktop.org xdg specs";
     homepage = https://github.com/lxde/libqtxdg;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
index 2776a53fa833..b5013f5ac1aa 100644
--- a/pkgs/desktops/lxqt/base/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libsysstat-${version}";
-  version = "0.3.3";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libsysstat";
     rev = version;
-    sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31";
+    sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx";
   };
 
   nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
index f8db33bc5a4d..8d369f464335 100644
--- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "lxqt-build-tools-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxqt-build-tools";
     rev = version;
-    sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv";
+    sha256 = "0i3pzgyd80n73dnqs8f6axinaji7biflgqsi33baxn4r1hy58ym1";
   };
 
-  nativeBuildInputs = [ cmake qt5.qtbase ];
+  nativeBuildInputs = [ cmake pkgconfig pcre qt5.qtbase ];
+
+  preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
 
   meta = with stdenv.lib; {
     description = "Various packaging tools and scripts for LXQt applications";