MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #55365 from romildo/upd.lxqt

Browse source 
lxqt: 0.13.0 -> 0.14.0
This commit is contained in:
xeji 2019-02-14 22:46:35 +01:00 committed by GitHub
commit 4a340dbfa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 188 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/desktops/lxqt/compton-conf/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }: { stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
libconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "compton-conf"; pname = "compton-conf";
version = "0.4.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1r187fx1vivzq1gcwwawax36mnlmfig5j1ba4s4wfdi3q2wcq7mw"; sha256 = "1vxbh0vr7wknr7rbmdbmy5md1fdkw3zwlgpbv16cwdplbv9m97xi";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
libconfig libconfig
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
preConfigure = '' preConfigure = ''
substituteInPlace autostart/CMakeLists.txt \ substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \

4
pkgs/desktops/lxqt/default.nix
View file

@ -18,7 +18,6 @@ let
lxqt-admin = callPackage ./lxqt-admin { }; lxqt-admin = callPackage ./lxqt-admin { };
lxqt-config = callPackage ./lxqt-config { }; lxqt-config = callPackage ./lxqt-config { };
lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; lxqt-globalkeys = callPackage ./lxqt-globalkeys { };
lxqt-l10n = callPackage ./lxqt-l10n { };
lxqt-notificationd = callPackage ./lxqt-notificationd { }; lxqt-notificationd = callPackage ./lxqt-notificationd { };
lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { };
lxqt-policykit = callPackage ./lxqt-policykit { }; lxqt-policykit = callPackage ./lxqt-policykit { };
@ -29,8 +28,6 @@ let
lxqt-themes = callPackage ./lxqt-themes { }; lxqt-themes = callPackage ./lxqt-themes { };
pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { };
qtermwidget = callPackage ./qtermwidget { }; 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 ### CORE 2
lxqt-panel = callPackage ./lxqt-panel { }; lxqt-panel = callPackage ./lxqt-panel { };
@ -70,7 +67,6 @@ let
lxqt-admin lxqt-admin
lxqt-config lxqt-config
lxqt-globalkeys lxqt-globalkeys
lxqt-l10n
lxqt-notificationd lxqt-notificationd
lxqt-openssh-askpass lxqt-openssh-askpass
lxqt-policykit lxqt-policykit

7
pkgs/desktops/lxqt/libfm-qt/default.nix
View file

@ -5,15 +5,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libfm-qt"; pname = "libfm-qt";
version = "0.13.1"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j"; sha256 = "1siqqn4waglymfi7c7lrmlxkylddw8qz0qfwqxr1hnmx3dsj9c36";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -34,8 +33,6 @@ stdenv.mkDerivation rec {
menu-cache menu-cache
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Core library of PCManFM-Qt (Qt binding for libfm)"; description = "Core library of PCManFM-Qt (Qt binding for libfm)";
homepage = https://github.com/lxqt/libfm-qt; homepage = https://github.com/lxqt/libfm-qt;

10
pkgs/desktops/lxqt/liblxqt/default.nix
View file

@ -2,15 +2,14 @@
qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "liblxqt"; pname = "liblxqt";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1lbvnx6gg15k7fy1bnv5sjji659f603glblcl8c9psh0m1cjdbll"; sha256 = "1cpl6sd2fifpflahm8fvrrscrv03sinfm03m7yc1k59y6nsbwi36";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,13 +28,14 @@ stdenv.mkDerivation rec {
]; ];
cmakeFlags = [ cmakeFlags = [
"-DPULL_TRANSLATIONS=NO"
"-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg" "-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|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 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; { meta = with stdenv.lib; {

12
pkgs/desktops/lxqt/libqtxdg/default.nix
View file

@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }: { stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqtxdg-${version}"; pname = "libqtxdg";
version = "3.2.0"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = "libqtxdg"; repo = pname;
rev = version; rev = version;
sha256 = "0lkmwnqk314mlr811rdb96p6i7zg67slxdvd4cdkiwakgbzzaa4m"; sha256 = "0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase qt5.qtsvg ]; buildInputs = [ qtbase qtsvg ];
preConfigure = '' preConfigure = ''
cmakeFlagsArray+=( cmakeFlagsArray+=(

14
pkgs/desktops/lxqt/libsysstat/default.nix
View file

@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: { stdenv, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsysstat-${version}"; pname = "libsysstat";
version = "0.4.1"; version = "0.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = "libsysstat"; repo = pname;
rev = version; 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; { meta = with stdenv.lib; {
description = "Library used to query system info and statistics"; description = "Library used to query system info and statistics";

18
pkgs/desktops/lxqt/lximage-qt/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lximage-qt"; pname = "lximage-qt";
version = "0.7.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1slmaic9cmj5lqa5kwc1qfbbycwh8840wnkg0nxc99ls0aazlpzi"; sha256 = "0zx9903ym5a9zk4m9khr22fj5sy57mg2v8wnk177wjm11lhic5v8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -19,18 +19,16 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qt5.qtsvg qtsvg
libfm-qt libfm-qt
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
libexif libexif
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The image viewer and screenshot tool for lxqt"; description = "The image viewer and screenshot tool for lxqt";
homepage = https://github.com/lxqt/lximage-qt; homepage = https://github.com/lxqt/lximage-qt;

10
pkgs/desktops/lxqt/lxqt-about/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-about"; pname = "lxqt-about";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "03f53rnn4rkd1xc2q9abnw37aq4sgvpbwhmcnckqyzc87lj6ici0"; sha256 = "14b13v1r5ncz4ycg25ac9ppafiifc37qws8kcw078if72rp9n121";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,7 +25,10 @@ stdenv.mkDerivation rec {
libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on"; description = "Dialogue window providing information about LXQt and the system it's running on";

14
pkgs/desktops/lxqt/lxqt-admin/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-admin"; pname = "lxqt-admin";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1nsf8sbgmfanvcxw67drhz1wrizkcd0p87jwr1za5rcgd50bi2yy"; sha256 = "0sdb514hgha5yvmbzi6nm1yx1rmbkh5fam09ybidjwpdwl2l4pxx";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,12 +26,15 @@ stdenv.mkDerivation rec {
polkit-qt polkit-qt
]; ];
patchPhase = '' postPatch = ''
sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \ sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
-i lxqt-admin-user/CMakeLists.txt -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; { meta = with stdenv.lib; {
description = "LXQt system administration tool"; description = "LXQt system administration tool";

12
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
View file

@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, glib }: { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxqt-build-tools-${version}"; pname = "lxqt-build-tools";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = "lxqt-build-tools"; repo = pname;
rev = version; rev = version;
sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz"; sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt5.qtbase glib pcre ]; buildInputs = [ qtbase glib pcre ];
preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"''; preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';

29
pkgs/desktops/lxqt/lxqt-config/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-config"; pname = "lxqt-config";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0r5vwkyz0c9b9py3wni4yzkmsvgs6psk9dp1fhfzvbjbknb21bfa"; sha256 = "1pp2pw43zh8kwi2cxk909wn6bw7kba95b6bv96l2gmzhdqpfw2a7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,13 +33,29 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libxcb xorg.libxcb
xorg.libXcursor xorg.libXcursor
xorg.xf86inputlibinput
xorg.xf86inputlibinput.dev
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
substituteInPlace src/CMakeLists.txt \ substituteInPlace src/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" --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; { meta = with stdenv.lib; {

10
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-globalkeys"; pname = "lxqt-globalkeys";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1fmi0n5chnrpbgf7zwzc3hi55r85hkxaq5jylbwaahmxhnb5hdid"; sha256 = "14bfkh54mn3jyq8g9ipy3xmc3n9lmlqpvm26kpqig7567hbncv7n";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,13 +26,14 @@ stdenv.mkDerivation rec {
libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
for dir in autostart xdg; do for dir in autostart xdg; do
substituteInPlace $dir/CMakeLists.txt \ substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done done
substituteInPlace config/CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

32
pkgs/desktops/lxqt/lxqt-l10n/default.nix
View file

@ -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 ];
};
}

12
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-notificationd"; pname = "lxqt-notificationd";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0vjpl3ipc0hrz255snkp99h6xrlid490ml8jb588rdpfina66sp1"; sha256 = "1nawcxy2qnrngcxvwjwmmh4fn7mhnfgy1g77rn90243jvy29wv5f";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -20,6 +19,11 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace autostart/CMakeLists.txt \ substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" --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 = [ buildInputs = [
@ -32,8 +36,6 @@ stdenv.mkDerivation rec {
qtx11extras qtx11extras
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The LXQt notification daemon"; description = "The LXQt notification daemon";
homepage = https://github.com/lxqt/lxqt-notificationd; homepage = https://github.com/lxqt/lxqt-notificationd;

10
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-openssh-askpass"; pname = "lxqt-openssh-askpass";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "19djmqwk4kj3rxs4h7a471ydcz87j5z4yv8a6pgblvqdkkn0ylk9"; sha256 = "19xcc6i7jg35780r4dfg4vwfp9x4pz5sqzagxnpzspz61jaj5ibv";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,7 +26,10 @@ stdenv.mkDerivation rec {
libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GUI to query passwords on behalf of SSH agents"; description = "GUI to query passwords on behalf of SSH agents";

12
pkgs/desktops/lxqt/lxqt-panel/default.nix
View file

@ -8,15 +8,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-panel"; pname = "lxqt-panel";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "056khr3smyrdi26zpclwv1qrmk0zxr9cnk65ad9c0xavzk6ya3xz"; sha256 = "0jr7ylf6d35m0ckn884arjk4armknnw8iyph00gcphn5bqycbn8l";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -50,8 +49,6 @@ stdenv.mkDerivation rec {
libXdamage libXdamage
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
for dir in autostart menu; do for dir in autostart menu; do
substituteInPlace $dir/CMakeLists.txt \ substituteInPlace $dir/CMakeLists.txt \
@ -59,6 +56,11 @@ stdenv.mkDerivation rec {
done done
substituteInPlace panel/CMakeLists.txt \ substituteInPlace panel/CMakeLists.txt \
--replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" --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; { meta = with stdenv.lib; {

10
pkgs/desktops/lxqt/lxqt-policykit/default.nix
View file

@ -5,15 +5,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-policykit"; pname = "lxqt-policykit";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1m9v4hl1hyd8rmlh6z2zy6287qfnavsm9khl526jf8f7bjgpifvd"; sha256 = "05k39819nsdyg2pp1vk6g2hdpxqp78h6bhb0hp5rclf9ap5fpvvc";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -34,11 +33,12 @@ stdenv.mkDerivation rec {
pcre pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
substituteInPlace autostart/CMakeLists.txt \ substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

12
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-powermanagement"; pname = "lxqt-powermanagement";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "04mx1nxqqqjg3wsql4ch4j1a4cbqfvpq0iwi6b9yhaf04n0dwrvn"; sha256 = "08xdnb54lji09izzzfip8fw0gp17qkx66jm6i04zby4whx4mqniv";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,11 +28,14 @@ stdenv.mkDerivation rec {
libqtxdg libqtxdg
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
substituteInPlace autostart/CMakeLists.txt \ substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" --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; { meta = with stdenv.lib; {

5
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
View file

@ -5,15 +5,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-qtplugin"; pname = "lxqt-qtplugin";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "19y5dvbj7gwyh8glc6vi6hb5snvkd3jwvss6j0sn2sy2gp9g9ryb"; sha256 = "16n50lxnya03zcviw65sy5dyg9dsrn64k91mrqfvraf6d90md4al";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/desktops/lxqt/lxqt-runner/default.nix
View file

@ -2,15 +2,14 @@
menu-cache, muparser, pcre }: menu-cache, muparser, pcre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-runner"; pname = "lxqt-runner";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0w6r9lby35p0lf5klasa5l2lscx6dmv16kzfhl4lc6w2qfwjb9vi"; sha256 = "1qyacig9ksnjrhws8cpk6arlaxn7kl0z39l3c62ql3m89mibsm88";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -33,11 +32,12 @@ stdenv.mkDerivation rec {
pcre pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
substituteInPlace autostart/CMakeLists.txt \ substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

12
pkgs/desktops/lxqt/lxqt-session/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, 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 { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-session"; pname = "lxqt-session";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0ngcrkmfpahii4yibsh03b8v8af93hhqm42kk1nnhczc8dg49mhs"; sha256 = "0nla1ki23p1bwzw5hbmh9l8yg3b0f55kflgnvyfakmvpivjbz3k6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -31,13 +30,16 @@ stdenv.mkDerivation rec {
xdg-user-dirs xdg-user-dirs
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
for dir in autostart config; do for dir in autostart config; do
substituteInPlace $dir/CMakeLists.txt \ substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
done done
for f in lxqt-{config-session,leave,session}/CMakeLists.txt; do
substituteInPlace $f \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

10
pkgs/desktops/lxqt/lxqt-sudo/default.nix
View file

@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-sudo"; pname = "lxqt-sudo";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1gpn3dhmzabx0jrqxq63549sah03kf6bmdc9d9kmg6hyr5xg3i1h"; sha256 = "0l8fq06kfsrmvg2fr8lqdsxr6fwxmxsa9zwaa3fs9inzaylm0jkh";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,7 +27,10 @@ stdenv.mkDerivation rec {
sudo sudo
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GUI frontend for sudo/su"; description = "GUI frontend for sudo/su";

9
pkgs/desktops/lxqt/lxqt-themes/default.nix
View file

@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, lxqt }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-themes"; pname = "lxqt-themes";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "026hbblxdbq48n9691b1z1xiak99khsk3wf09vn4iaj5zi7dwhw5"; sha256 = "09dkcgnf3lmfly8v90p6wjlj5rin83pbailvvpx2jr8a48a8zb9f";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
postPatch = '' postPatch = ''

18
pkgs/desktops/lxqt/obconf-qt/default.nix
View file

@ -1,28 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }: { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
qtx11extras, xorg, lxqt-build-tools, openbox, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "obconf-qt"; pname = "obconf-qt";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0mixf35p7b563f77vnikk9b1wqhbdawp723sd30rfql76gkjwjcn"; sha256 = "00v5w8qr3vs0k91flij9lz7y1cpp2g8ivgnmmm43ymjfiz5j6l27";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt.lxqt-build-tools lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
pcre pcre
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
xorg.libSM xorg.libSM
@ -30,8 +30,6 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The Qt port of obconf, the Openbox configuration tool"; description = "The Qt port of obconf, the Openbox configuration tool";
homepage = https://github.com/lxqt/obconf-qt; homepage = https://github.com/lxqt/obconf-qt;

10
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, pcre, qtbase, qttools, qtx11extras }: { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
pcre, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "pavucontrol-qt"; pname = "pavucontrol-qt";
version = "0.4.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk"; sha256 = "1vyjm6phgbxglk65c889bd73b0p2ffb5bsc89dmb07qzllyrjb4h";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
pcre pcre
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
homepage = https://github.com/lxqt/pavucontrol-qt; homepage = https://github.com/lxqt/pavucontrol-qt;

18
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
View file

@ -1,35 +1,33 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qt5, libfm-qt, menu-cache, lxmenu-data }: { stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools,
qtx11extras, libfm-qt, menu-cache, lxmenu-data }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "pcmanfm-qt"; pname = "pcmanfm-qt";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0xnhdxx45fmbi5dqic3j2f7yq01s0xysimafj5zqs0a29zw3i4m0"; sha256 = "0hf4qyn12mpr6rrla9mf6ka5gb4y36amk7d14ayr7yka1r16p8lz";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
lxqt-build-tools lxqt.lxqt-build-tools
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
libfm-qt libfm-qt
libfm-qt libfm-qt
menu-cache menu-cache
lxmenu-data lxmenu-data
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = '' postPatch = ''
for dir in autostart config; do for dir in autostart config; do
substituteInPlace $dir/CMakeLists.txt \ substituteInPlace $dir/CMakeLists.txt \

4
pkgs/desktops/lxqt/qlipper/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }: { stdenv, fetchFromGitHub, cmake, qtbase, qttools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase qt5.qttools ]; buildInputs = [ qtbase qttools ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Cross-platform clipboard history applet"; description = "Cross-platform clipboard history applet";

12
pkgs/desktops/lxqt/qps/default.nix
View file

@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }: { stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools,
lxqt-build-tools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qps"; pname = "qps";
version = "1.10.18"; version = "1.10.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1cq5z4w2n119z2bq0njn508g5582jljdx2n38cv5b3cf35k91a49"; sha256 = "1vyi1vw4z5j2sp9yhhv91wl2sbg4fh0djqslg1ssc7fww2ka6dx3";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake lxqt-build-tools ];
buildInputs = [ qt5.qtbase qt5.qtx11extras qt5.qttools ]; buildInputs = [ qtbase qtx11extras qttools ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The Qt process manager"; description = "The Qt process manager";

16
pkgs/desktops/lxqt/qterminal/default.nix
View file

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, qt5 }: { stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget,
qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qterminal"; pname = "qterminal";
version = "0.9.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1z9wlyj5i192jfq3dcxjf8wzx9x332f19c9ll7zv69cq21kyy9wn"; sha256 = "071qz248j9gcqzchnrz8xamm07g4r2xyrmnb0a2vjkjd63pk2r8f";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -18,14 +18,12 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qt5.qtbase qtbase
qt5.qttools qttools
qt5.qtx11extras qtx11extras
qtermwidget qtermwidget
]; ];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A lightweight Qt-based terminal emulator"; description = "A lightweight Qt-based terminal emulator";
homepage = https://github.com/lxqt/qterminal; homepage = https://github.com/lxqt/qterminal;

26
pkgs/desktops/lxqt/qtermwidget/0.7.1.nix
View file

@ -1,26 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, qt5 }:
stdenv.mkDerivation rec {
name = "${pname}_0_7_1-${version}";
pname = "qtermwidget";
version = "0.7.1";
srcs = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qt5.qtbase ];
meta = with stdenv.lib; {
description = "A terminal emulator widget for Qt 5";
homepage = https://github.com/lxqt/qtermwidget;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
};
}

13
pkgs/desktops/lxqt/qtermwidget/default.nix
View file

@ -1,22 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: { stdenv, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qtermwidget"; pname = "qtermwidget";
version = "0.9.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "05gbdjzgmcr3ljs9ba3qvh7a3v6yn6vakwfy8avld9gy5bdd76rg"; sha256 = "0wv8fssbc2w7kkpq9ngsa8wyjraggdhsbz36gyxyv8fy5m78jq0n";
}; };
nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; nativeBuildInputs = [ cmake lxqt-build-tools ];
buildInputs = [ qt5.qtbase qt5.qttools]; buildInputs = [ qtbase qttools];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A terminal emulator widget for Qt 5"; description = "A terminal emulator widget for Qt 5";

16
pkgs/desktops/lxqt/screengrab/default.nix
View file

@ -1,17 +1,21 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }: { stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "screengrab-${version}"; pname = "screengrab";
version = "1.98"; version = "1.100";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = "screengrab"; repo = pname;
rev = version; rev = version;
sha256 = "1y3r29220z6y457cajpad3pjnr883smbvh0kai8hc5hh4k4kxs6v"; sha256 = "1iqrmf581x9ab6zzjxm2509gg6fkn7hwril4v0aki7n7dgxw1c4g";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [
cmake
pkgconfig
autoPatchelfHook # fix libuploader.so and libextedit.so not found
];
buildInputs = [ buildInputs = [
qtbase qtbase

4
pkgs/desktops/lxqt/update.sh
View file

@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
root=../../.. root=../../..
export NIXPKGS_ALLOW_UNFREE=1 export NIXPKGS_ALLOW_UNFREE=1
lxqt_version=0.13.0 lxqt_version=0.14.0
lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html
version() { version() {
@ -28,7 +28,7 @@ update_lxqt() {
local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null) local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null)
update-source-version lxqt.$pname "$pversion" update-source-version lxqt.$pname "$pversion"
git add $pfile git add $pfile
git commit -m "$pname: $pversionold -> $pversion" git commit -m "lxqt.$pname: $pversionold -> $pversion"
) )
fi fi
echo echo