7 files changed, 27 insertions, 45 deletions
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 6e1ea1288539..253f8112f5b2 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "compton-conf";
-  version = "0.2.1";
+  version = "0.3.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq";
+    sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb";
   };
 
   nativeBuildInputs = [
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
+  preConfigure = ''
+    substituteInPlace autostart/CMakeLists.txt \
+      --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
+    '';
+
   meta = with stdenv.lib; {
     description = "GUI configuration tool for compton X composite manager";
     homepage = https://github.com/lxde/compton-conf;
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
index 3308f0e412bd..80921cac891d 100644
--- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
@@ -3,16 +3,15 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lximage-qt";
-  version = "0.5.1";
+  version = "0.6.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb";
+    sha256 = "0zmrpfgmlq005zikyvhqbpip6mz6pfcf9aqjpncyc5vlggmh28ym";
   };
 
-
   nativeBuildInputs = [
     cmake
     pkgconfig
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
index 36490b726e0f..e3cb02e8b8af 100644
--- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "obconf-qt";
-  version = "0.11.1";
+  version = "0.12.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc";
+    sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5";
   };
 
   nativeBuildInputs = [
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    pcre
     qt5.qtbase
     qt5.qttools
     qt5.qtx11extras
diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix
index 376b8fb0190d..04b0cd3e6ac6 100644
--- a/pkgs/desktops/lxqt/optional/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "qlipper";
   version = "5.0.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "pvanek";
     repo = pname;
     rev = version;
diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/optional/qps/default.nix
index d39341eb05d0..e27388fa1681 100644
--- a/pkgs/desktops/lxqt/optional/qps/default.nix
+++ b/pkgs/desktops/lxqt/optional/qps/default.nix
@@ -1,39 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, makeDesktopItem }:
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qps";
-  version = "1.10.16";
+  version = "1.10.17";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "QtDesktop";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1s6hvqfv9hv1cl5pfsmghqn1zqhibr4plq3glzgd8s7swwdnsvjj";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "qps";
-    exec = "qps";
-    icon = "qps";
-    comment = "Visual process manager - Qt version of ps/top";
-    desktopName = "qps";
-    genericName = meta.description;
-    categories = "System;";
+    rev = version;
+    sha256 = "1d5r6w9wsxjdrzq2hllrj2n1d9azy6g05hg0w0s6pikrmn1yl0a3";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ qt5.qtbase qt5.qtx11extras ];
-
-  installPhase = ''
-    mkdir -p $out/{bin,share/{man/man1,doc,icons}}
-    cp -a src/qps $out/bin/
-    cp -a ../README.md $out/share/doc/
-    cp -a ../qps.1 $out/share/man/man1/
-    cp -a ../icon/icon.xpm $out/share/icons/qps.xpm
-    ln -sv "${desktopItem}/share/applications" $out/share/
-  '';
+  buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ];
 
   meta = with stdenv.lib; {
     description = "The Qt process manager";
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
index ff59a2d893c6..88c4740760f8 100644
--- a/pkgs/desktops/lxqt/optional/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qterminal";
-  version = "0.7.1";
+  version = "0.8.0";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb";
+    sha256 = "1899a5zc5kx7mxiyrncigqjia1k98qg526qynf4754nr9ifghxdw";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index 4bd040c00a8b..3c4bebf39fd9 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "screengrab-${version}";
   version = "1.97";
 
-  srcs = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "QtDesktop";
     repo = "screengrab";
     rev = version;
@@ -24,10 +24,6 @@ stdenv.mkDerivation rec {
     xorg.libXdmcp
   ];
 
-  cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ];
-
-  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
-
   meta = with stdenv.lib; {
     description = "Crossplatform tool for fast making screenshots";
     homepage = https://github.com/lxde/screengrab;