From 3b7a6f9c2958fc1ebce03cb4325901872e1a4a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:37:31 -0300
Subject: [PATCH 01/35] lxqt: init at 0.11

---
 pkgs/desktops/lxqt/default.nix  | 11 +++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/default.nix

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
new file mode 100644
index 00000000000..61f1c85dc89
--- /dev/null
+++ b/pkgs/desktops/lxqt/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, newScope, fetchFromGitHub }:
+
+let
+  callPackage = newScope self;
+
+  self = rec {
+
+    # For compiling information, see:
+    # - https://github.com/lxde/lxqt/wiki/Building-from-source  
+
+in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e27f77ad54c..95ba61ec87f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16053,6 +16053,8 @@ in
 
     in makeOverridable makePackages extra;
 
+  lxqt = recurseIntoAttrs (callPackage ../desktops/lxqt { });
+
   mate = recurseIntoAttrs (callPackage ../desktops/mate {
     callPackage = newScope pkgs.mate;
   });

From 3757a24ced4e427635bca790bd8567c9cbbe063e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:39:38 -0300
Subject: [PATCH 02/35] lxqt: standard patch applied to several lxqt packages

---
 pkgs/desktops/lxqt/default.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 61f1c85dc89..1216c81b872 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -7,5 +7,23 @@ let
 
     # For compiling information, see:
     # - https://github.com/lxde/lxqt/wiki/Building-from-source  
+      
+    standardPatch = ''
+      for file in $(find . -name CMakeLists.txt); do
+        substituteInPlace $file \
+          --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \
+          --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
+          --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \
+          --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphhics" \
+          --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"lib/qt5/plugins" \
+          --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations
+        echo ============================
+        echo $file
+        grep --color=always DESTINATION $file || true
+        grep --color=always share/lxqt/translations $file || true
+        grep --color=always platformthemes $file || true
+      done
+      echo --------------------------------------------------------
+    '';
 
 in self

From c8def0a3ac2f3496b9972a6ea23e8a5adaad6968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:43:06 -0300
Subject: [PATCH 03/35] libqtxdg: init at 2.0.0

---
 pkgs/desktops/lxqt/base/libqtxdg/default.nix | 25 ++++++++++++++++++++
 pkgs/desktops/lxqt/default.nix               |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/base/libqtxdg/default.nix

diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
new file mode 100644
index 00000000000..47d3fb2e91c
--- /dev/null
+++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "libqtxdg-${version}";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "libqtxdg";
+    rev = version;
+    sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ qt5.qtbase qt5.qtsvg ];
+
+  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;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 1216c81b872..9f2710ab823 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -26,4 +26,7 @@ let
       echo --------------------------------------------------------
     '';
 
+    ### BASE
+    libqtxdg = callPackage ./base/libqtxdg { };
+
 in self

From 6b92742a4697696468c579c053a796d75430c22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:45:16 -0300
Subject: [PATCH 04/35] libsysstat: init at 0.3.2

---
 .../desktops/lxqt/base/libsysstat/default.nix | 25 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/base/libsysstat/default.nix

diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
new file mode 100644
index 00000000000..363b3d33d14
--- /dev/null
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "libsysstat-${version}";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "libsysstat";
+    rev = version;
+    sha256 = "1swpnz37daj3njkbqddmhaiipfl335c3g675y9afhabg7l4anf1n";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ qt5.qtbase ];
+
+  meta = with stdenv.lib; {
+    description = "Library used to query system info and statistics";
+    homepage = https://github.com/lxde/libsysstat;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 9f2710ab823..52a6d7c87aa 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -28,5 +28,6 @@ let
 
     ### BASE
     libqtxdg = callPackage ./base/libqtxdg { };
+    libsysstat = callPackage ./base/libsysstat { };
 
 in self

From 9899d3a2fd6bb14986c8d842a645d3bee2111d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:46:35 -0300
Subject: [PATCH 05/35] liblxqt: init at 0.11.0

---
 pkgs/desktops/lxqt/base/liblxqt/default.nix | 44 +++++++++++++++++++++
 pkgs/desktops/lxqt/default.nix              |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/base/liblxqt/default.nix

diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
new file mode 100644
index 00000000000..b973940b9b6
--- /dev/null
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "liblxqt";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "12gla3pdg0n28w15qrmha83xm3021xdby8ydwp1qzcips5pa5zac";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.libqtxdg
+    xorg.libXScrnSaver
+  ];
+
+  cmakeFlags = [
+    "-DPULL_TRANSLATIONS=NO"
+    "-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg"
+  ];
+  
+  patchPhase = ''
+    sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Core utility library for all LXQt components";
+    homepage = https://github.com/lxde/liblxqt;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 52a6d7c87aa..a013e107f7b 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -29,5 +29,6 @@ let
     ### BASE
     libqtxdg = callPackage ./base/libqtxdg { };
     libsysstat = callPackage ./base/libsysstat { };
+    liblxqt = callPackage ./base/liblxqt { };
 
 in self

From 44180b2cfab09b3c6c03668d96ec6abddea3b28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:49:44 -0300
Subject: [PATCH 06/35] libfm-qt: init at 0.11.1

---
 pkgs/desktops/lxqt/core/libfm-qt/default.nix | 43 ++++++++++++++++++++
 pkgs/desktops/lxqt/default.nix               |  3 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/libfm-qt/default.nix

diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
new file mode 100644
index 00000000000..71b6cff5899
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
+libfm, menu-cache }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "libfm-qt";
+  version = "0.11.1";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "1kgvzjsa4ihlj2clz6y6s95nq0lhg66d1dhkgw3mdqaak7d0pdiz";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  buildInputs = [
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    xorg.libpthreadstubs
+    xorg.libXdmcp
+    libfm
+    menu-cache
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+   
+  meta = with stdenv.lib; {
+    description = "Core library of PCManFM-Qt (Qt binding for libfm)";
+    homepage = https://github.com/lxde/libfm-qt;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index a013e107f7b..6aac0d62af6 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -31,4 +31,7 @@ let
     libsysstat = callPackage ./base/libsysstat { };
     liblxqt = callPackage ./base/liblxqt { };
 
+    ### CORE 1
+    libfm-qt = callPackage ./core/libfm-qt { };
+
 in self

From e76201b27350b9ef0c8e6d90728eec2f97aa57ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:51:17 -0300
Subject: [PATCH 07/35] lxqt-about: init at 0.11.0

---
 .../desktops/lxqt/core/lxqt-about/default.nix | 37 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-about/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
new file mode 100644
index 00000000000..3e3b047dd4e
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-about";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "0739gp3af68cvf8fxqvd203xqzncglmxpklq8mryrs5f1xnqp6gc";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  postPatch = lxqt.standardPatch;
+
+  meta = with stdenv.lib; {
+    description = "Dialogue window providing information about LXQt and the system it's running on";
+    homepage = https://github.com/lxde/lxqt-about;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 6aac0d62af6..e6a6467baa1 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -33,5 +33,6 @@ let
 
     ### CORE 1
     libfm-qt = callPackage ./core/libfm-qt { };
+    lxqt-about = callPackage ./core/lxqt-about { };
 
 in self

From 708dec170ef0034a281c26c6d621d37753ec165b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:52:08 -0300
Subject: [PATCH 08/35] lxqt-admin: init at 0.11.0

---
 .../desktops/lxqt/core/lxqt-admin/default.nix | 40 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-admin/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
new file mode 100644
index 00000000000..da47e02dcf1
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, polkit }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-admin";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "17g9v6dyqy5pgpqragpf0sgnfxz2ip2g7xix7kmkna3qyym44b23";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    polkit
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  postPatch = lxqt.standardPatch;
+
+  meta = with stdenv.lib; {
+    description = "LXQt system administration tool";
+    homepage = https://github.com/lxde/lxqt-admin;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index e6a6467baa1..8b5348a0704 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -34,5 +34,6 @@ let
     ### CORE 1
     libfm-qt = callPackage ./core/libfm-qt { };
     lxqt-about = callPackage ./core/lxqt-about { };
+    lxqt-admin = callPackage ./core/lxqt-admin { };
 
 in self

From 74b3da7ce7b2a6d94c8234de4ab2038a76f63e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:53:03 -0300
Subject: [PATCH 09/35] lxqt-common: init at 0.11.0

---
 .../lxqt/core/lxqt-common/default.nix         | 41 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-common/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
new file mode 100644
index 00000000000..b8076042a04
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, hicolor_icon_theme, xmessage }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-common";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "14nx3zcknwsn713wdnmb2xl15vf21vh13kxscdwmfnd48m5j4m3b";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    hicolor_icon_theme
+    xmessage
+  ];
+
+  postPatch = lxqt.standardPatch
+  + ''
+    substituteInPlace ./startlxqt.in \
+      --replace xmessage "${xmessage}"/bin/xmessage
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Common files for LXQt";
+    homepage = https://github.com/lxde/lxqt-common;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 8b5348a0704..7fba900ddd3 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -35,5 +35,6 @@ let
     libfm-qt = callPackage ./core/libfm-qt { };
     lxqt-about = callPackage ./core/lxqt-about { };
     lxqt-admin = callPackage ./core/lxqt-admin { };
+    lxqt-common = callPackage ./core/lxqt-common { };
 
 in self

From 2537f81ed0f6797bf556a2eb5c6a8673461998dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:53:48 -0300
Subject: [PATCH 10/35] lxqt-config: init at 0.11.0

---
 .../lxqt/core/lxqt-config/default.nix         | 47 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-config/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
new file mode 100644
index 00000000000..66187a0ae6f
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-config";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "187x19s0jw20an37v7svkry6p021ply4i3ngh5w2nx5rlqkf63qw";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+   ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    kde5.libkscreen
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    xorg.libpthreadstubs
+    xorg.libXdmcp
+    xorg.libXScrnSaver
+    xorg.libxcb
+    xorg.libXcursor
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  postPatch = lxqt.standardPatch;
+
+  meta = with stdenv.lib; {
+    description = "Tools to configure LXQt and the underlying operating system";
+    homepage = https://github.com/lxde/lxqt-config;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 7fba900ddd3..232d6ba9220 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -36,5 +36,6 @@ let
     lxqt-about = callPackage ./core/lxqt-about { };
     lxqt-admin = callPackage ./core/lxqt-admin { };
     lxqt-common = callPackage ./core/lxqt-common { };
+    lxqt-config = callPackage ./core/lxqt-config { };
 
 in self

From 0d68fecae788ba6ca674663623d851166c5954ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:54:34 -0300
Subject: [PATCH 11/35] lxqt-globalkeys: init at 0.11.0

---
 .../lxqt/core/lxqt-globalkeys/default.nix     | 38 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
new file mode 100644
index 00000000000..7f1f140653f
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-globalkeys";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "05kcq21fyz7vnhh9k4nzhskgbghp1slsz14gh9anhya4a567xx0y";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  postPatch = lxqt.standardPatch;
+
+  meta = with stdenv.lib; {
+    description = "Daemon used to register global keyboard shortcuts";
+    homepage = https://github.com/lxde/lxqt-globalkeys;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 232d6ba9220..7c4eb63790f 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -37,5 +37,6 @@ let
     lxqt-admin = callPackage ./core/lxqt-admin { };
     lxqt-common = callPackage ./core/lxqt-common { };
     lxqt-config = callPackage ./core/lxqt-config { };
+    lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
 
 in self

From bec679780d30b5dde09db6333cb1a4fb6e630441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:55:22 -0300
Subject: [PATCH 12/35] lxqt-notificationd: init at 0.11.0

---
 .../lxqt/core/lxqt-notificationd/default.nix  | 35 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
new file mode 100644
index 00000000000..1ecef633494
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-notificationd";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "001xcvmg7ap5pbssc9pqp4jshgq2h4zxk9rra76xnrby6k8n6p3x";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "The LXQt notification daemon";
+    homepage = https://github.com/lxde/lxqt-notificationd;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 7c4eb63790f..52f1961e6d7 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -38,5 +38,6 @@ let
     lxqt-common = callPackage ./core/lxqt-common { };
     lxqt-config = callPackage ./core/lxqt-config { };
     lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
+    lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
 
 in self

From bca1f38df39f03642ec5a5beda7216f811c365a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:56:22 -0300
Subject: [PATCH 13/35] lxqt-openssh-askpass: init at 0.11.0

---
 .../core/lxqt-openssh-askpass/default.nix     | 36 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
new file mode 100644
index 00000000000..202231fbdea
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-openssh-askpass";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "0nz8sv3yrqbzgmd6jahaqaa71axy5x06k091splp9cmab0vzng7c";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "GUI to query passwords on behalf of SSH agents";
+    homepage = https://github.com/lxde/lxqt-openssh-askpass;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 52f1961e6d7..9f32897384c 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -39,5 +39,6 @@ let
     lxqt-config = callPackage ./core/lxqt-config { };
     lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
     lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
+    lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { };
 
 in self

From ae2c6ef448e5ad2a0104c2ba4f7f134894bf112d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:57:29 -0300
Subject: [PATCH 14/35] lxqt-l10n: init at 0.11.0

---
 pkgs/desktops/lxqt/core/lxqt-l10n/default.nix | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-l10n/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
new file mode 100644
index 00000000000..477575289bb
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "lxqt-l10n-${version}";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "lxqt-l10n";
+    rev = version;
+    sha256 = "1gwismyjfdd7lwlgfl5jvbxmkbq9v9ia0shm4f7hkkvlpc2y24gk";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    qt5.qtbase
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace "\''${LXQT_TRANSLATIONS_DIR}" "$out"/share/lxqt/translations
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "Translations of LXQt";
+    homepage = https://github.com/lxde/lxqt-l10n;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}

From c28390963cee243b54745b218fc6712441a4030d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 18:59:34 -0300
Subject: [PATCH 15/35] lxqt-powermanagement: init at 0.11.0

---
 .../core/lxqt-powermanagement/default.nix     | 38 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  3 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
new file mode 100644
index 00000000000..aabce857edd
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-powermanagement";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "10myxrhlhvr9cmcqv67skzd11c40bgqgf6qdvm5smww2il1mzfwa";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    kde5.solid
+    kde5.kidletime
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "Power management module for LXQt";
+    homepage = https://github.com/lxde/lxqt-powermanagement;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 9f32897384c..ea7824f14e2 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -38,7 +38,10 @@ let
     lxqt-common = callPackage ./core/lxqt-common { };
     lxqt-config = callPackage ./core/lxqt-config { };
     lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
+    lxqt-l10n = callPackage ./core/lxqt-l10n { };
     lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
     lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { };
+    lxqt-policykit = callPackage ./core/lxqt-policykit { };
+    lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { };
 
 in self

From fa59539b6901b26356875b19aabec209e95fba4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:00:08 -0300
Subject: [PATCH 16/35] lxqt-qtplugin: init at 0.11.0

---
 .../lxqt/core/lxqt-qtplugin/default.nix       | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
new file mode 100644
index 00000000000..e0a95d23c4e
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-qtplugin";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "14bwi1c078arin025jcygz0db9nfr8qla9071ls17bbp4dh14vhx";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qtx11extras
+    qt5.qttools
+    qt5.qtsvg
+    qt5.libdbusmenu
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  postPatch = lxqt.standardPatch;
+
+  meta = with stdenv.lib; {
+    description = "LXQt Qt platform integration plugin";
+    homepage = https://github.com/lxde/lxqt-qtplugin;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}

From 59dac76153deef4e703629d9aa2beed77bf87eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:00:54 -0300
Subject: [PATCH 17/35] lxqt-session: init at 0.11.0

---
 .../lxqt/core/lxqt-session/default.nix        | 38 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-session/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
new file mode 100644
index 00000000000..a226169b21a
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, xdg-user-dirs }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-session";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "1vb8mcy6z1irnd977x5425mbp4c7yc9dhk5552isqss1qb44hpn4";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    xorg.libpthreadstubs
+    xorg.libXdmcp
+    xdg-user-dirs
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "An alternative session manager ported from the original razor-session";
+    homepage = https://github.com/lxde/lxqt-session;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index ea7824f14e2..24ff415c293 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -43,5 +43,7 @@ let
     lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { };
     lxqt-policykit = callPackage ./core/lxqt-policykit { };
     lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { };
+    lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
+    lxqt-session = callPackage ./core/lxqt-session { };
 
 in self

From 7dfe181b68df83a46518419090c63c7c83a1d0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:01:39 -0300
Subject: [PATCH 18/35] lxqt-sudo: init at 0.11.0

---
 pkgs/desktops/lxqt/core/lxqt-sudo/default.nix | 37 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-sudo/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
new file mode 100644
index 00000000000..ad0885917ae
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, sudo }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-sudo";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "0nmn0j5qvqpkhlq8yvl8ycn3hijbnwxd32hhmxhcnaq07cmzbg1j";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    sudo
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "GUI frontend for sudo/su";
+    homepage = https://github.com/lxde/lxqt-sudo;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 24ff415c293..2649f24fd43 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -45,5 +45,6 @@ let
     lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { };
     lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
     lxqt-session = callPackage ./core/lxqt-session { };
+    lxqt-sudo = callPackage ./core/lxqt-sudo { };
 
 in self

From 5c1d1caa16840ca135e3cc5f17283d217e4bd7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:02:24 -0300
Subject: [PATCH 19/35] pavucontrol-qt: init at 0.1.0

---
 .../lxqt/core/pavucontrol-qt/default.nix      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix

diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
new file mode 100644
index 00000000000..ea2f24d6cf1
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt,
+xdg-user-dirs, libpulseaudio }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "pavucontrol-qt";
+  version = "0.1.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "1bis88ykasrnk9a55nnbn832acjz2h76h6i3lbxnb36yq71wan7j";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    xdg-user-dirs
+    libpulseaudio
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
+    homepage = https://github.com/lxde/pavucontrol-qt;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}

From 5fc6923af7b2099b568352957e8f15c3c9e7aec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:03:17 -0300
Subject: [PATCH 20/35] qtermwidget: init at 0.7.0

---
 .../lxqt/core/qtermwidget/default.nix         | 26 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/qtermwidget/default.nix

diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
new file mode 100644
index 00000000000..33f3cc19cf6
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "qtermwidget";
+  version = "0.7.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "18dnrzpbijh0xdgx83zs8nlbxk0d7hgzib54fqqvxyrjjy4g9scz";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ qt5.qtbase ];
+
+  meta = with stdenv.lib; {
+    description = "A terminal emulator widget for Qt 5";
+    homepage = https://github.com/lxde/qtermwidget;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 2649f24fd43..95ad0360120 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -46,5 +46,7 @@ let
     lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
     lxqt-session = callPackage ./core/lxqt-session { };
     lxqt-sudo = callPackage ./core/lxqt-sudo { };
+    pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
+    qtermwidget = callPackage ./core/qtermwidget { };
 
 in self

From a5f681eca733339335589c1a8f905119f3917643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:03:59 -0300
Subject: [PATCH 21/35] lxqt-panel: init at 0.11.0

---
 .../desktops/lxqt/core/lxqt-panel/default.nix | 51 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  3 ++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-panel/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
new file mode 100644
index 00000000000..844aa3f8249
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
+libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, lxmenu-data }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-panel";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "0lwgz6nir4cd50xbmc3arngnw38rb5kqgcsgp3dlq6gpncg45hdq";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    qt5.libdbusmenu
+    kde5.kwindowsystem
+    kde5.solid
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    lxqt.lxqt-globalkeys
+    lxqt.libsysstat
+    xorg.libpthreadstubs
+    xorg.libXdmcp
+    libstatgrab
+    lm_sensors
+    libpulseaudio
+    alsaLib
+    menu-cache
+    lxmenu-data
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  postPatch = lxqt.standardPatch;
+
+  meta = with stdenv.lib; {
+    description = "The LXQt desktop panel";
+    homepage = https://github.com/lxde/lxqt-panel;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 95ad0360120..47a21877a9d 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -49,4 +49,7 @@ let
     pavucontrol-qt = callPackage ./core/pavucontrol-qt { };
     qtermwidget = callPackage ./core/qtermwidget { };
 
+    ### CORE 2
+    lxqt-panel = callPackage ./core/lxqt-panel { };
+
 in self

From cb8908d8074dbc6023fcc52b1df92719df7330d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:05:01 -0300
Subject: [PATCH 22/35] lxqt-runner: init at 0.11.0

---
 .../lxqt/core/lxqt-runner/default.nix         | 39 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-runner/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
new file mode 100644
index 00000000000..02d6f90397a
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt,
+menu-cache, muparser }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-runner";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "1gqs1b90km39dbg49g80x770i9jknni4h8y6ka2r1fga35amllkc";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    lxqt.lxqt-globalkeys
+    menu-cache
+    muparser
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "Tool used to launch programs quickly by typing their names";
+    homepage = https://github.com/lxde/lxqt-runner;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 47a21877a9d..1b20d2b1746 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -51,5 +51,6 @@ let
 
     ### CORE 2
     lxqt-panel = callPackage ./core/lxqt-panel { };
+    lxqt-runner = callPackage ./core/lxqt-runner { };
 
 in self

From d16c535224ee736883ee3a54a77c6344fb4d0faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:06:13 -0300
Subject: [PATCH 23/35] pcmanfm-qt: init at 0.11.1

---
 .../desktops/lxqt/core/pcmanfm-qt/default.nix | 43 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix

diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
new file mode 100644
index 00000000000..bc9cf774017
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, libfm,
+menu-cache, lxmenu-data }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "pcmanfm-qt";
+  version = "0.11.1";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "04fv23glcnfiszam90iy3gvn2sigyk8zj8a1s43wz8fgjijnws32";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    lxqt.libfm-qt
+    xorg.libpthreadstubs
+    xorg.libXdmcp
+    libfm
+    menu-cache
+    lxmenu-data
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
+    homepage = https://github.com/lxde/pcmanfm-qt;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 1b20d2b1746..b847e5ef94b 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -52,5 +52,6 @@ let
     ### CORE 2
     lxqt-panel = callPackage ./core/lxqt-panel { };
     lxqt-runner = callPackage ./core/lxqt-runner { };
+    pcmanfm-qt = callPackage ./core/pcmanfm-qt { };
 
 in self

From 3900ec6be6f875ab0624d2f65c73695339fd16da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:07:26 -0300
Subject: [PATCH 24/35] qterminal: init at 0.7.0

---
 .../lxqt/optional/qterminal/default.nix       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/optional/qterminal/default.nix

diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
new file mode 100644
index 00000000000..7f0f66c6fbe
--- /dev/null
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "qterminal";
+  version = "0.7.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "1g8d66h8avk094wvgqw0mgl9caamdig6bnn4vawshn4j7y8g4n7v";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    lxqt.qtermwidget
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "A lightweight Qt-based terminal emulator";
+    homepage = https://github.com/lxde/qterminal;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}

From 5fdc3646e38b5694d1b0954f8e5e97b49187ed26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:08:00 -0300
Subject: [PATCH 25/35] qterminal: init at 0.7.0

---
 pkgs/desktops/lxqt/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index b847e5ef94b..ad5bed349db 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -54,4 +54,7 @@ let
     lxqt-runner = callPackage ./core/lxqt-runner { };
     pcmanfm-qt = callPackage ./core/pcmanfm-qt { };
 
+    ### OPTIONAL
+    qterminal = callPackage ./optional/qterminal { };
+
 in self

From e7dc5d2057465794b50a84070bd13fda37d4494f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:10:07 -0300
Subject: [PATCH 26/35] lxqt-policykit: init at 0.11.0

---
 .../lxqt/core/lxqt-policykit/default.nix      | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/core/lxqt-policykit/default.nix

diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
new file mode 100644
index 00000000000..627f43f8be6
--- /dev/null
+++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lxqt-policykit";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "0rbqzh8r259cc44f1cb236p9c3lp195zjdsw3w1nz7j7gzv9yjnd";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    qt5.polkit-qt
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "The LXQt PolicyKit agent";
+    homepage = https://github.com/lxde/lxqt-policykit;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}

From f3e8bfa8237b75892b470dca116763db62a34c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:12:17 -0300
Subject: [PATCH 27/35] lxqt service: init at 0.11

---
 .../services/x11/desktop-managers/default.nix |  2 +-
 .../services/x11/desktop-managers/lxqt.nix    | 72 +++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/lxqt.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 1ea7b5ccf16..31412ae7014 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,7 @@ in
   # E.g., if KDE is enabled, it supersedes xterm.
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix
-    ./enlightenment.nix ./gnome3.nix ./kodi.nix
+    ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
new file mode 100644
index 00000000000..0349d61abbc
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -0,0 +1,72 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.lxqt;
+
+in
+
+{
+  options = {
+
+    services.xserver.desktopManager.lxqt.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable the LXQt desktop manager";
+    };
+
+  };
+
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+
+    services.xserver.desktopManager.session = singleton {
+      name = "lxqt";
+      start = ''
+        exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt
+      '';
+    };
+
+    environment.systemPackages = [
+      pkgs.kde5.oxygen-icons5 # default icon theme
+      pkgs.libfm
+      pkgs.libfm-extra
+      pkgs.lxmenu-data
+      pkgs.lxqt.libfm-qt
+      pkgs.lxqt.liblxqt
+      pkgs.lxqt.libqtxdg
+      pkgs.lxqt.libsysstat
+      pkgs.lxqt.lxqt-about
+      pkgs.lxqt.lxqt-admin
+      pkgs.lxqt.lxqt-common
+      pkgs.lxqt.lxqt-config
+      pkgs.lxqt.lxqt-globalkeys
+      pkgs.lxqt.lxqt-l10n
+      pkgs.lxqt.lxqt-notificationd
+      pkgs.lxqt.lxqt-openssh-askpass
+      pkgs.lxqt.lxqt-panel
+      pkgs.lxqt.lxqt-policykit
+      pkgs.lxqt.lxqt-powermanagement
+      pkgs.lxqt.lxqt-qtplugin
+      pkgs.lxqt.lxqt-runner
+      pkgs.lxqt.lxqt-session
+      pkgs.lxqt.lxqt-sudo
+      pkgs.lxqt.pavucontrol-qt
+      pkgs.lxqt.pcmanfm-qt
+      pkgs.lxqt.qterminal
+      pkgs.lxqt.qtermwidget
+      pkgs.menu-cache
+      pkgs.openbox # default window manager
+    ];
+
+    # Link some extra directories in /run/current-system/software/share
+    environment.pathsToLink = [
+      "/share/lxqt"
+      "/share/desktop-directories"
+    ];
+
+  };
+}

From 49ed3ab705c463efa59724ea9a8f57e16f0b99b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Oct 2016 19:57:00 -0300
Subject: [PATCH 28/35] lxqt: fix small issues in nix expressions

---
 nixos/modules/services/x11/desktop-managers/lxqt.nix | 1 +
 pkgs/desktops/lxqt/core/lxqt-panel/default.nix       | 4 +++-
 pkgs/desktops/lxqt/default.nix                       | 8 +++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 0349d61abbc..4a89ee880ca 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -31,6 +31,7 @@ in
     };
 
     environment.systemPackages = [
+      pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
       pkgs.kde5.oxygen-icons5 # default icon theme
       pkgs.libfm
       pkgs.libfm-extra
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index 844aa3f8249..d5786444fad 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
-libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, lxmenu-data }:
+libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
+lxmenu-data }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
     qt5.libdbusmenu
     kde5.kwindowsystem
     kde5.solid
+    kde5.kguiaddons
     lxqt.liblxqt
     lxqt.libqtxdg
     lxqt.lxqt-globalkeys
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index ad5bed349db..d559d295437 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -6,8 +6,8 @@ let
   self = rec {
 
     # For compiling information, see:
-    # - https://github.com/lxde/lxqt/wiki/Building-from-source  
-      
+    # - https://github.com/lxde/lxqt/wiki/Building-from-source
+  
     standardPatch = ''
       for file in $(find . -name CMakeLists.txt); do
         substituteInPlace $file \
@@ -21,7 +21,7 @@ let
         echo $file
         grep --color=always DESTINATION $file || true
         grep --color=always share/lxqt/translations $file || true
-        grep --color=always platformthemes $file || true
+        grep --color=always platform $file || true
       done
       echo --------------------------------------------------------
     '';
@@ -56,5 +56,7 @@ let
 
     ### OPTIONAL
     qterminal = callPackage ./optional/qterminal { };
+   
+  };
 
 in self

From 0b4e3e7822a2a429e752e94dd917c48a3d780139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 5 Oct 2016 20:39:03 -0300
Subject: [PATCH 29/35] lxqt: Add qtsvg to systemPackages

---
 nixos/modules/services/x11/desktop-managers/lxqt.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 4a89ee880ca..4b6100e25e3 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -33,6 +33,7 @@ in
     environment.systemPackages = [
       pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
       pkgs.kde5.oxygen-icons5 # default icon theme
+      pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
       pkgs.libfm
       pkgs.libfm-extra
       pkgs.lxmenu-data
@@ -65,8 +66,9 @@ in
 
     # Link some extra directories in /run/current-system/software/share
     environment.pathsToLink = [
-      "/share/lxqt"
       "/share/desktop-directories"
+      "/share/icons"
+      "/share/lxqt"
     ];
 
   };

From 4689abc40a617f88a32d7af037fcc0c8829e5c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 5 Oct 2016 20:41:12 -0300
Subject: [PATCH 30/35] lxqt: Fix mispelling of the word 'graphics'

---
 pkgs/desktops/lxqt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index d559d295437..e531a4ee947 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -14,7 +14,7 @@ let
           --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \
           --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
           --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \
-          --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphhics" \
+          --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \
           --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"lib/qt5/plugins" \
           --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations
         echo ============================

From fbe7c92bd519f5ee409e3d4b8481c39f6ea122d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 5 Oct 2016 21:00:01 -0300
Subject: [PATCH 31/35] lxqt: Add libkscreen to systemPackages

---
 nixos/modules/services/x11/desktop-managers/lxqt.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 4b6100e25e3..aac2de6ff5d 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -32,8 +32,8 @@ in
 
     environment.systemPackages = [
       pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
+      pkgs.kde5.libkscreen # provides plugins for screen management software
       pkgs.kde5.oxygen-icons5 # default icon theme
-      pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
       pkgs.libfm
       pkgs.libfm-extra
       pkgs.lxmenu-data
@@ -62,6 +62,7 @@ in
       pkgs.lxqt.qtermwidget
       pkgs.menu-cache
       pkgs.openbox # default window manager
+      pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
     ];
 
     # Link some extra directories in /run/current-system/software/share

From 49bb8488163dca4e7caaab07c5f2f6cadc2a2918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 5 Oct 2016 22:35:59 -0300
Subject: [PATCH 32/35] pcmanfm-qt: use version from the LXQt desktop

pcmanfm-qt is part of the LXQt desktop. With the addition of LXQt to
nixpkgs, including a newer package for pcmanfm-qt, the older one is
removed and the entry in all-packages refers to the one in lxqt.
---
 pkgs/applications/misc/pcmanfm-qt/default.nix | 60 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 pkgs/applications/misc/pcmanfm-qt/default.nix

diff --git a/pkgs/applications/misc/pcmanfm-qt/default.nix b/pkgs/applications/misc/pcmanfm-qt/default.nix
deleted file mode 100644
index 5b270f15fb6..00000000000
--- a/pkgs/applications/misc/pcmanfm-qt/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, cmake
-, pkgconfig
-, qt5
-, menu-cache
-, libfm
-, elementary-icon-theme
-}:
-
-let
-  version = "0.11.0";
-
-  buildInputsCommon = [ cmake pkgconfig qt5.qtbase qt5.qttools qt5.qtx11extras menu-cache libfm ];
-
-  libfm-qt = stdenv.mkDerivation rec {
-    name    = "${pname}-${version}";
-    pname   = "libfm-qt";
-
-    src = fetchFromGitHub {
-      owner  = "lxde";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0a8rd0m66l6n2jl7fin74byyy69pyc6rgnfkpmkbi6561l903592";
-    };
-
-    buildInputs = buildInputsCommon;
-  };
-
-in stdenv.mkDerivation rec {
-  name    = "${pname}-${version}";
-  pname   = "pcmanfm-qt";
-
-  src = fetchFromGitHub {
-    owner  = "lxde";
-    repo   = pname;
-    rev    = version;
-    sha256 = "139l8m32sqcjmydppbv24iqnfsbl5b4rqmqzdayvlh6haf1ihinn";
-  };
-
-
-  buildInputs = buildInputsCommon ++ [ libfm-qt qt5.makeQtWrapper ];
-
-  postPatch = ''
-    substituteInPlace pcmanfm/settings.cpp --replace \"elementary\" \"Elementary\"
-  '';
-
-  postInstall = ''
-    wrapQtProgram $out/bin/pcmanfm-qt \
-      --prefix XDG_DATA_DIRS : "${elementary-icon-theme}/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage    = "https://github.com/lxde/pcmanfm-qt";
-    license     = licenses.gpl2Plus;
-    description = "File manager with QT interface";
-    maintainers = with maintainers; [ obadz ];
-    platforms   = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95ba61ec87f..6ecdd043403 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13704,7 +13704,7 @@ in
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
-  pcmanfm-qt = callPackage ../applications/misc/pcmanfm-qt { };
+  pcmanfm-qt = lxqt.pcmanfm-qt;
 
   pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };
 

From 0d7056331db7072e2a003a0d60ecc1dc822d728b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 6 Oct 2016 19:01:04 -0300
Subject: [PATCH 33/35] compton-conf: init at 0.2.0

---
 .../services/x11/desktop-managers/lxqt.nix    |  1 +
 pkgs/desktops/lxqt/default.nix                |  1 +
 .../lxqt/optional/compton-conf/default.nix    | 37 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/optional/compton-conf/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index aac2de6ff5d..c4fe207df91 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -37,6 +37,7 @@ in
       pkgs.libfm
       pkgs.libfm-extra
       pkgs.lxmenu-data
+      pkgs.lxqt.compton-conf
       pkgs.lxqt.libfm-qt
       pkgs.lxqt.liblxqt
       pkgs.lxqt.libqtxdg
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index e531a4ee947..123b5f94acf 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -56,6 +56,7 @@ let
 
     ### OPTIONAL
     qterminal = callPackage ./optional/qterminal { };
+    compton-conf = callPackage ./optional/compton-conf { };
    
   };
 
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
new file mode 100644
index 00000000000..45717fe31e2
--- /dev/null
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, libconfig }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "compton-conf";
+  version = "0.2.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "04svxawa8l0ciflrspkzi13nnl7bljmfwwrgxn5lb3sw6qdcmdlk";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    libconfig
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "GUI configuration tool for compton X composite manager";
+    homepage = https://github.com/lxde/compton-conf;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}

From 4a3c05b920c3a83fc90721e5a7cbfda47c3f388d Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 7 Oct 2016 06:56:41 -0300
Subject: [PATCH 34/35] lxqt-common: Do not preserve mode when copying files to
 home direcotry

---
 pkgs/desktops/lxqt/core/lxqt-common/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
index b8076042a04..a4b8f000dc7 100644
--- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
   postPatch = lxqt.standardPatch
   + ''
     substituteInPlace ./startlxqt.in \
+      --replace  "cp " "cp --no-preserve=mode " \
       --replace xmessage "${xmessage}"/bin/xmessage
   '';
 

From a5bbe8970ff04d0589d5b2ad93db41917d86d41b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 7 Oct 2016 06:57:25 -0300
Subject: [PATCH 35/35] obconf-qt: init at 0.11.0

---
 .../services/x11/desktop-managers/lxqt.nix    |  1 +
 pkgs/desktops/lxqt/default.nix                |  1 +
 .../lxqt/optional/obconf-qt/default.nix       | 41 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/optional/obconf-qt/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index c4fe207df91..810b0125a22 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -57,6 +57,7 @@ in
       pkgs.lxqt.lxqt-runner
       pkgs.lxqt.lxqt-session
       pkgs.lxqt.lxqt-sudo
+      pkgs.lxqt.obconf-qt
       pkgs.lxqt.pavucontrol-qt
       pkgs.lxqt.pcmanfm-qt
       pkgs.lxqt.qterminal
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 123b5f94acf..2ef49ff2e4e 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -57,6 +57,7 @@ let
     ### OPTIONAL
     qterminal = callPackage ./optional/qterminal { };
     compton-conf = callPackage ./optional/compton-conf { };
+    obconf-qt = callPackage ./optional/obconf-qt { };
    
   };
 
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
new file mode 100644
index 00000000000..381c998616f
--- /dev/null
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt,
+openbox, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "obconf-qt";
+  version = "0.11.0";
+
+  srcs = fetchFromGitHub {
+    owner = "lxde";
+    repo = pname;
+    rev = version;
+    sha256 = "1q3y4sc1kg3hw4869rx4g08y85rnvnxgk8rf8h6amkf5r5561iyk";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtx11extras
+    qt5.qtsvg
+    kde5.kwindowsystem
+    lxqt.liblxqt
+    lxqt.libqtxdg
+    xorg.libpthreadstubs
+    xorg.libXdmcp
+    openbox
+    hicolor_icon_theme
+  ];
+
+  cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "The Qt port of obconf, the Openbox configuration tool";
+    homepage = https://github.com/lxde/obconf-qt;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ romildo ];
+    platforms = with platforms; unix;
+  };
+}