diff options
Diffstat (limited to 'pkgs/desktops/lxqt/core')
20 files changed, 173 insertions, 141 deletions
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix index 78c0a926b9c8..612fbeafe199 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - xorg, libfm, menu-cache, + pcre, libexif, xorg, libfm, menu-cache, qtx11extras, qttools }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v"; + sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i"; }; nativeBuildInputs = [ @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + pcre + libexif + xorg.libpthreadstubs + xorg.libxcb + xorg.libXdmcp qtx11extras qttools libfm diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix index ac81391af1d9..645d634a26fe 100644 --- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-about"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk"; + sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3"; }; nativeBuildInputs = [ @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = 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; diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix index 23b142f352f0..54731b22686c 100644 --- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-admin"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr"; + sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi"; }; nativeBuildInputs = [ @@ -29,8 +29,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; - meta = with stdenv.lib; { description = "LXQt system administration tool"; homepage = https://github.com/lxde/lxqt-admin; diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix deleted file mode 100644 index cc114c31dfd5..000000000000 --- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "lxqt-common"; - version = "0.11.2"; - - src = fetchFromGitHub { - owner = "lxde"; - repo = pname; - rev = version; - sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn"; - }; - - nativeBuildInputs = [ - cmake - lxqt.lxqt-build-tools - ]; - - buildInputs = [ - qt5.qtsvg - hicolor_icon_theme - xmessage - ]; - - postPatch = lxqt.standardPatch - + '' - substituteInPlace ./startlxqt.in \ - --replace "cp " "cp --no-preserve=mode " \ - --replace xmessage "${xmessage}"/bin/xmessage - ''; - - meta = with stdenv.lib; { - description = "Common files for LXQt"; - homepage = https://github.com/lxde/lxqt-common; - license = licenses.lgpl21; - platforms = with platforms; unix; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 20e785ec5fda..191fe0796e88 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-config"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx"; + sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377"; }; nativeBuildInputs = [ @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; meta = with stdenv.lib; { description = "Tools to configure LXQt and the underlying operating system"; @@ -46,12 +49,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ romildo ]; }; - patches = [ - # Fixes a FTBFS with CMake v3.8 - (fetchpatch { - url = https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch; - sha256 = "17k26xj97ks9gvcjhiwc5y39fciria4xyxrzcz67zj0flqm3cmrf"; - }) - ]; - } diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix index 73248da1ef80..9e74eee5ec17 100644 --- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-globalkeys"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; + sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a"; }; nativeBuildInputs = [ @@ -29,7 +29,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart xdg; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; meta = with stdenv.lib; { description = "Daemon used to register global keyboard shortcuts"; diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix index b836b9776e65..10b767aedac0 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lxqt-l10n-${version}"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-l10n"; rev = version; - sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h"; + sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix index 8aea9a6458b3..061a8522a6fe 100644 --- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, qtx11extras }: +{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-notificationd"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc"; + sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43"; }; nativeBuildInputs = [ @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { lxqt-build-tools ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + buildInputs = [ qtbase qttools @@ -24,7 +29,6 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common qtx11extras ]; diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix index a52ce02cd14b..bcc00a0add50 100644 --- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-openssh-askpass"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9"; + sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index 8dbe8990937e..77a49410bb60 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,22 +1,22 @@ { - stdenv, fetchFromGitHub, fetchpatch, standardPatch, + stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, + kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data + lxmenu-data, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-panel"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; + sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x"; }; nativeBuildInputs = [ @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { kguiaddons liblxqt libqtxdg - lxqt-common lxqt-globalkeys libsysstat xorg.libpthreadstubs @@ -47,19 +46,19 @@ stdenv.mkDerivation rec { alsaLib menu-cache lxmenu-data - ]; - - patches = [ - (fetchpatch { - url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; - name = "fix-compile-explicit-keyword.patch"; - sha256 = "1grda0dw175kbsfq90lr5qaf79akwikzxw85jhd5f339nnramp81"; - }) + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - postPatch = standardPatch; + postPatch = '' + for dir in autostart menu; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + substituteInPlace panel/CMakeLists.txt \ + --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" + ''; meta = with stdenv.lib; { description = "The LXQt desktop panel"; diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix index bdcc0a4d606e..fca6a9ff1f61 100644 --- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, - libqtxdg, + libqtxdg, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-policykit"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p"; + sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d"; }; nativeBuildInputs = [ @@ -31,10 +31,16 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "The LXQt PolicyKit agent"; homepage = https://github.com/lxde/lxqt-policykit; diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix index d3793a9d9286..e5012abed6a4 100644 --- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-powermanagement"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79"; + sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d"; }; nativeBuildInputs = [ @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "Power management module for LXQt"; homepage = https://github.com/lxde/lxqt-powermanagement; diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix index d5b8987bbb82..c5fae1e9ecb3 100644 --- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix @@ -1,19 +1,19 @@ { - stdenv, fetchFromGitHub, standardPatch, + stdenv, fetchFromGitHub, cmake, lxqt-build-tools, - qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, + qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-qtplugin"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02"; + sha256 = "1i1rga0pg764ccwhq7acdsckxpl1apxwj4lv4gygxxmpkrg62zkv"; }; nativeBuildInputs = [ @@ -28,11 +28,13 @@ stdenv.mkDerivation rec { qtsvg libdbusmenu libqtxdg + libfm-qt ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - - postPatch = standardPatch; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" + ''; meta = with stdenv.lib; { description = "LXQt Qt platform integration plugin"; diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix index 8e2332dad5c7..0c1f08b34d77 100644 --- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, qtx11extras, -menu-cache, muparser }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, +menu-cache, muparser, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-runner"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954"; + sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093"; }; nativeBuildInputs = [ @@ -27,14 +27,19 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common lxqt-globalkeys menu-cache muparser + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + substituteInPlace autostart/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + ''; + meta = with stdenv.lib; { description = "Tool used to launch programs quickly by typing their names"; homepage = https://github.com/lxde/lxqt-runner; diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix index ba0bb69ce926..d3733950ed00 100644 --- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-session"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv"; + sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb"; }; nativeBuildInputs = [ @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { kwindowsystem liblxqt libqtxdg - lxqt-common xorg.libpthreadstubs xorg.libXdmcp xdg-user-dirs @@ -34,6 +33,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + for dir in autostart config; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; + meta = with stdenv.lib; { description = "An alternative session manager ported from the original razor-session"; homepage = https://github.com/lxde/lxqt-session; diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix index 1e235af3c900..8700a768abdf 100644 --- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-sudo"; - version = "0.11.1"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk"; + sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix new file mode 100644 index 000000000000..6251667430b2 --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-themes"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n"; + }; + + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" + substituteInPlace themes/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" + ''; + + meta = with stdenv.lib; { + description = "Themes, graphics and icons for LXQt"; + homepage = https://github.com/lxde/lxqt-themes; + license = licenses.lgpl21; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix index b8421d062021..918894d2208f 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio, pcre }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pavucontrol-qt"; - version = "0.2.0"; + version = "0.3.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj"; + sha256 = "1pfqdzsbygvq77npsizydps25d9g6vgw177yqvmz3cg3a68dad27"; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { qt5.qttools qt5.qtx11extras libpulseaudio + pcre ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix index 7c115c2ca27f..d9e2a651c3a8 100644 --- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pcmanfm-qt"; - version = "0.11.3"; + version = "0.12.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f"; + sha256 = "050h5w1wph35l5m69qbxzvc96y7y0bg1m7flqdadrp688pbnzcxb"; }; nativeBuildInputs = [ @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + postPatch = '' + for dir in autostart config; do + substituteInPlace $dir/CMakeLists.txt \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" + done + ''; + meta = with stdenv.lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = https://github.com/lxde/pcmanfm-qt; diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix index 66620e195ec0..f882088d07b8 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.7.1"; + version = "0.8.0"; - srcs = fetchFromGitHub { + src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; + sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; - buildInputs = [ qt5.qtbase ]; + buildInputs = [ qt5.qtbase qt5.qttools]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; meta = with stdenv.lib; { description = "A terminal emulator widget for Qt 5"; |