summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2019-02-14 22:46:35 +0100
committerGitHub <noreply@github.com>2019-02-14 22:46:35 +0100
commit4a340dbfa781b7fbc4c5ff8378013df9cae9b24b (patch)
tree86f497e9742a5bfd2036056f085ae6d59a54a3b2
parent7db1bc584ee1df1b9e06386c0b6c27cf4fc02a60 (diff)
parentf0c7f54bd252887954ccca3b16a8a18a516a8cc5 (diff)
Merge pull request #55365 from romildo/upd.lxqt
lxqt: 0.13.0 -> 0.14.0
-rw-r--r--pkgs/desktops/lxqt/compton-conf/default.nix10
-rw-r--r--pkgs/desktops/lxqt/default.nix4
-rw-r--r--pkgs/desktops/lxqt/libfm-qt/default.nix7
-rw-r--r--pkgs/desktops/lxqt/liblxqt/default.nix10
-rw-r--r--pkgs/desktops/lxqt/libqtxdg/default.nix12
-rw-r--r--pkgs/desktops/lxqt/libsysstat/default.nix14
-rw-r--r--pkgs/desktops/lxqt/lximage-qt/default.nix18
-rw-r--r--pkgs/desktops/lxqt/lxqt-about/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-admin/default.nix14
-rw-r--r--pkgs/desktops/lxqt/lxqt-build-tools/default.nix12
-rw-r--r--pkgs/desktops/lxqt/lxqt-config/default.nix29
-rw-r--r--pkgs/desktops/lxqt/lxqt-globalkeys/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-l10n/default.nix32
-rw-r--r--pkgs/desktops/lxqt/lxqt-notificationd/default.nix12
-rw-r--r--pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-panel/default.nix12
-rw-r--r--pkgs/desktops/lxqt/lxqt-policykit/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-powermanagement/default.nix12
-rw-r--r--pkgs/desktops/lxqt/lxqt-qtplugin/default.nix5
-rw-r--r--pkgs/desktops/lxqt/lxqt-runner/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-session/default.nix12
-rw-r--r--pkgs/desktops/lxqt/lxqt-sudo/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-themes/default.nix9
-rw-r--r--pkgs/desktops/lxqt/obconf-qt/default.nix18
-rw-r--r--pkgs/desktops/lxqt/pavucontrol-qt/default.nix10
-rw-r--r--pkgs/desktops/lxqt/pcmanfm-qt/default.nix18
-rw-r--r--pkgs/desktops/lxqt/qlipper/default.nix4
-rw-r--r--pkgs/desktops/lxqt/qps/default.nix12
-rw-r--r--pkgs/desktops/lxqt/qterminal/default.nix16
-rw-r--r--pkgs/desktops/lxqt/qtermwidget/0.7.1.nix26
-rw-r--r--pkgs/desktops/lxqt/qtermwidget/default.nix13
-rw-r--r--pkgs/desktops/lxqt/screengrab/default.nix16
-rwxr-xr-xpkgs/desktops/lxqt/update.sh4
33 files changed, 188 insertions, 233 deletions
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index 9c36b523207f..479491b35d80 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
+ libconfig }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "compton-conf";
- version = "0.4.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1r187fx1vivzq1gcwwawax36mnlmfig5j1ba4s4wfdi3q2wcq7mw";
+ sha256 = "1vxbh0vr7wknr7rbmdbmy5md1fdkw3zwlgpbv16cwdplbv9m97xi";
};
nativeBuildInputs = [
@@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
libconfig
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
preConfigure = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 62b8aaf25abe..db21a72cb9b1 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -18,7 +18,6 @@ let
lxqt-admin = callPackage ./lxqt-admin { };
lxqt-config = callPackage ./lxqt-config { };
lxqt-globalkeys = callPackage ./lxqt-globalkeys { };
- lxqt-l10n = callPackage ./lxqt-l10n { };
lxqt-notificationd = callPackage ./lxqt-notificationd { };
lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { };
lxqt-policykit = callPackage ./lxqt-policykit { };
@@ -29,8 +28,6 @@ let
lxqt-themes = callPackage ./lxqt-themes { };
pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { };
qtermwidget = callPackage ./qtermwidget { };
- # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
- qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { };
### CORE 2
lxqt-panel = callPackage ./lxqt-panel { };
@@ -70,7 +67,6 @@ let
lxqt-admin
lxqt-config
lxqt-globalkeys
- lxqt-l10n
lxqt-notificationd
lxqt-openssh-askpass
lxqt-policykit
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 4c187f1a07c5..70675e1408cf 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -5,15 +5,14 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "libfm-qt";
- version = "0.13.1";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j";
+ sha256 = "1siqqn4waglymfi7c7lrmlxkylddw8qz0qfwqxr1hnmx3dsj9c36";
};
nativeBuildInputs = [
@@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
menu-cache
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
meta = with stdenv.lib; {
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
homepage = https://github.com/lxqt/libfm-qt;
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 0762dbad3f87..1b19275ece92 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -2,15 +2,14 @@
qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "liblxqt";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1lbvnx6gg15k7fy1bnv5sjji659f603glblcl8c9psh0m1cjdbll";
+ sha256 = "1cpl6sd2fifpflahm8fvrrscrv03sinfm03m7yc1k59y6nsbwi36";
};
nativeBuildInputs = [
@@ -29,13 +28,14 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
- "-DPULL_TRANSLATIONS=NO"
"-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg"
];
- patchPhase = ''
+ postPatch = ''
sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 0b23fb2d04f5..852c4bddec83 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }:
stdenv.mkDerivation rec {
- name = "libqtxdg-${version}";
- version = "3.2.0";
+ pname = "libqtxdg";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "lxqt";
- repo = "libqtxdg";
+ repo = pname;
rev = version;
- sha256 = "0lkmwnqk314mlr811rdb96p6i7zg67slxdvd4cdkiwakgbzzaa4m";
+ sha256 = "0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ qt5.qtbase qt5.qtsvg ];
+ buildInputs = [ qtbase qtsvg ];
preConfigure = ''
cmakeFlagsArray+=(
diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
index 2e6b79f9769a..74fa1b03fa6b 100644
--- a/pkgs/desktops/lxqt/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/libsysstat/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
stdenv.mkDerivation rec {
- name = "libsysstat-${version}";
- version = "0.4.1";
+ pname = "libsysstat";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "lxqt";
- repo = "libsysstat";
+ repo = pname;
rev = version;
- sha256 = "0ad5pcr5lq1hvrfijvddvz2fvsmh1phb54wb0f756av0kyiwq0gb";
+ sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz";
};
- nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
+ nativeBuildInputs = [ cmake lxqt-build-tools ];
- buildInputs = [ qt5.qtbase ];
+ buildInputs = [ qtbase ];
meta = with stdenv.lib; {
description = "Library used to query system info and statistics";
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 7f80e56bc7d2..a0a83ad3469a 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt-build-tools, libfm-qt, libexif }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools,
+ qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lximage-qt";
- version = "0.7.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1slmaic9cmj5lqa5kwc1qfbbycwh8840wnkg0nxc99ls0aazlpzi";
+ sha256 = "0zx9903ym5a9zk4m9khr22fj5sy57mg2v8wnk177wjm11lhic5v8";
};
nativeBuildInputs = [
@@ -19,18 +19,16 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
libfm-qt
xorg.libpthreadstubs
xorg.libXdmcp
libexif
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
meta = with stdenv.lib; {
description = "The image viewer and screenshot tool for lxqt";
homepage = https://github.com/lxqt/lximage-qt;
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index e109a4f0944c..013be8eea4f9 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-about";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "03f53rnn4rkd1xc2q9abnw37aq4sgvpbwhmcnckqyzc87lj6ici0";
+ sha256 = "14b13v1r5ncz4ycg25ac9ppafiifc37qws8kcw078if72rp9n121";
};
nativeBuildInputs = [
@@ -26,7 +25,10 @@ stdenv.mkDerivation rec {
libqtxdg
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
+ '';
meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on";
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index a92c352087e8..528f9a390f92 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-admin";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1nsf8sbgmfanvcxw67drhz1wrizkcd0p87jwr1za5rcgd50bi2yy";
+ sha256 = "0sdb514hgha5yvmbzi6nm1yx1rmbkh5fam09ybidjwpdwl2l4pxx";
};
nativeBuildInputs = [
@@ -27,12 +26,15 @@ stdenv.mkDerivation rec {
polkit-qt
];
- patchPhase = ''
+ postPatch = ''
sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
-i lxqt-admin-user/CMakeLists.txt
- '';
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ for f in lxqt-admin-{user,time}/CMakeLists.txt; do
+ substituteInPlace $f \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
+ done
+ '';
meta = with stdenv.lib; {
description = "LXQt system administration tool";
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index 46f904d0ec7f..f55fa579ff45 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
stdenv.mkDerivation rec {
- name = "lxqt-build-tools-${version}";
- version = "0.5.0";
+ pname = "lxqt-build-tools";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "lxqt";
- repo = "lxqt-build-tools";
+ repo = pname;
rev = version;
- sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz";
+ sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2";
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ qt5.qtbase glib pcre ];
+ buildInputs = [ qtbase glib pcre ];
preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 3a167996ddb2..d2c583b53fa9 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase,
+ qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt,
+ libqtxdg, xorg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-config";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0r5vwkyz0c9b9py3wni4yzkmsvgs6psk9dp1fhfzvbjbknb21bfa";
+ sha256 = "1pp2pw43zh8kwi2cxk909wn6bw7kba95b6bv96l2gmzhdqpfw2a7";
};
nativeBuildInputs = [
@@ -32,13 +33,29 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver
xorg.libxcb
xorg.libXcursor
+ xorg.xf86inputlibinput
+ xorg.xf86inputlibinput.dev
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+
+ for f in \
+ lxqt-config-file-associations/CMakeLists.txt \
+ lxqt-config-brightness/CMakeLists.txt \
+ lxqt-config-appearance/CMakeLists.txt \
+ lxqt-config-locale/CMakeLists.txt \
+ lxqt-config-monitor/CMakeLists.txt \
+ lxqt-config-input/CMakeLists.txt \
+ liblxqt-config-cursor/CMakeLists.txt \
+ src/CMakeLists.txt
+ do
+ substituteInPlace $f \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
+ done
+
+ sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 1877236bcddc..5382be304ae3 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-globalkeys";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1fmi0n5chnrpbgf7zwzc3hi55r85hkxaq5jylbwaahmxhnb5hdid";
+ sha256 = "14bfkh54mn3jyq8g9ipy3xmc3n9lmlqpvm26kpqig7567hbncv7n";
};
nativeBuildInputs = [
@@ -27,13 +26,14 @@ stdenv.mkDerivation rec {
libqtxdg
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
postPatch = ''
for dir in autostart xdg; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done
+
+ substituteInPlace config/CMakeLists.txt \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/lxqt/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/lxqt-l10n/default.nix
deleted file mode 100644
index 9a79ec16df09..000000000000
--- a/pkgs/desktops/lxqt/lxqt-l10n/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
-
-stdenv.mkDerivation rec {
- name = "lxqt-l10n-${version}";
- version = "0.13.0";
-
- src = fetchFromGitHub {
- owner = "lxqt";
- repo = "lxqt-l10n";
- rev = version;
- sha256 = "0q1hzj6sa4wc8sgqqqsqfldjpnvihacfq73agvc2li3q6qi5rr0k";
- };
-
- nativeBuildInputs = [
- cmake
- qt5.qttools
- lxqt.lxqt-build-tools
- ];
-
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace "\''${LXQT_TRANSLATIONS_DIR}" "$out"/share/lxqt/translations
- '';
-
- meta = with stdenv.lib; {
- description = "Translations of LXQt";
- homepage = https://github.com/lxqt/lxqt-l10n;
- license = licenses.lgpl21Plus;
- platforms = with platforms; unix;
- maintainers = with maintainers; [ romildo ];
- };
-}
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 32a3c408258c..53826f62bccf 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-notificationd";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0vjpl3ipc0hrz255snkp99h6xrlid490ml8jb588rdpfina66sp1";
+ sha256 = "1nawcxy2qnrngcxvwjwmmh4fn7mhnfgy1g77rn90243jvy29wv5f";
};
nativeBuildInputs = [
@@ -20,6 +19,11 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+
+ for f in {config,src}/CMakeLists.txt; do
+ substituteInPlace $f \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
+ done
'';
buildInputs = [
@@ -32,8 +36,6 @@ stdenv.mkDerivation rec {
qtx11extras
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
meta = with stdenv.lib; {
description = "The LXQt notification daemon";
homepage = https://github.com/lxqt/lxqt-notificationd;
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 56ea7ec72418..f880aed63f8a 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-openssh-askpass";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "19djmqwk4kj3rxs4h7a471ydcz87j5z4yv8a6pgblvqdkkn0ylk9";
+ sha256 = "19xcc6i7jg35780r4dfg4vwfp9x4pz5sqzagxnpzspz61jaj5ibv";
};
nativeBuildInputs = [
@@ -27,7 +26,10 @@ stdenv.mkDerivation rec {
libqtxdg
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
+ '';
meta = with stdenv.lib; {
description = "GUI to query passwords on behalf of SSH agents";
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 8cdbf9f9365a..f691357f25f6 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -8,15 +8,14 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-panel";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "056khr3smyrdi26zpclwv1qrmk0zxr9cnk65ad9c0xavzk6ya3xz";
+ sha256 = "0jr7ylf6d35m0ckn884arjk4armknnw8iyph00gcphn5bqycbn8l";
};
nativeBuildInputs = [
@@ -50,8 +49,6 @@ stdenv.mkDerivation rec {
libXdamage
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
postPatch = ''
for dir in autostart menu; do
substituteInPlace $dir/CMakeLists.txt \
@@ -59,6 +56,11 @@ stdenv.mkDerivation rec {
done
substituteInPlace panel/CMakeLists.txt \
--replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg"
+
+ for f in cmake/BuildPlugin.cmake panel/CMakeLists.txt; do
+ substituteInPlace $f \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
+ done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index dcf46d09b732..862e0c08cedf 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -5,15 +5,14 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-policykit";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1m9v4hl1hyd8rmlh6z2zy6287qfnavsm9khl526jf8f7bjgpifvd";
+ sha256 = "05k39819nsdyg2pp1vk6g2hdpxqp78h6bhb0hp5rclf9ap5fpvvc";
};
nativeBuildInputs = [
@@ -34,11 +33,12 @@ stdenv.mkDerivation rec {
pcre
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 3b56a489bee5..9ebff5d4de58 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-powermanagement";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "04mx1nxqqqjg3wsql4ch4j1a4cbqfvpq0iwi6b9yhaf04n0dwrvn";
+ sha256 = "08xdnb54lji09izzzfip8fw0gp17qkx66jm6i04zby4whx4mqniv";
};
nativeBuildInputs = [
@@ -29,11 +28,14 @@ stdenv.mkDerivation rec {
libqtxdg
];
- cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
postPatch = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
+
+ for f in {config,src}/CMakeLists.txt; do
+ substituteInPlace $f \
+ --replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
+ done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 972d0a3cb379..82f393cf8d52 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -5,15 +5,14 @@
}:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-qtplugin";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "19y5dvbj7gwyh8glc6vi6hb5snvkd3jwvss6j0sn2sy2gp9g9ryb";
+ sha256 = "16n50lxnya03zcviw65sy5dyg9dsrn64k91mrqfvraf6d90md4al";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index c0ce6321f6e9..dc2d8c58cafe 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -2,15 +2,14 @@
menu-cache, muparser, pcre }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "lxqt-runner";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0w6r9lby35p0lf5klasa5l2lscx6dmv16kzfhl4lc6w2qfwjb9vi";
+ sha256 = "1qyacig9ksnjrhws8cpk6arlaxn7kl0z39l3c62ql3m89mibsm88";
};
nativeBuildInputs = [
@@ -33,11 +32,12 @@ stdenv.mkD