alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #65482 from worldofpeace/fix-lxqt

Browse source 
lxqt: use qt5's mkDerivation
This commit is contained in:
Robin Gloster 2019-08-25 18:15:01 +02:00 committed by GitHub
parent 6adb914c29 e34de045b6
commit 5292fd51f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 122 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt,
libconfig }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "compton-conf";
version = "0.14.1";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "GUI configuration tool for compton X composite manager";
homepage = https://github.com/lxqt/compton-conf;
license = licenses.lgpl21;

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

@ -1,10 +1,10 @@
{
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
pcre, libexif, xorg, libfm, menu-cache,
qtx11extras, qttools
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "libfm-qt";
version = "0.14.1";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
menu-cache
];
meta = with stdenv.lib; {
meta = with lib; {
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
homepage = https://github.com/lxqt/libfm-qt;
license = licenses.lgpl21;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras,
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras,
qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "liblxqt";
version = "0.14.1";
@ -27,18 +27,11 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver
];
cmakeFlags = [
"-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg"
];
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; {
meta = with lib; {
description = "Core utility library for all LXQt components";
homepage = https://github.com/lxqt/liblxqt;
license = licenses.lgpl21Plus;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }:
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "libqtxdg";
version = "3.3.1";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
)
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Qt implementation of freedesktop.org xdg specs";
homepage = https://github.com/lxqt/libqtxdg;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "libsysstat";
version = "0.4.2";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Library used to query system info and statistics";
homepage = https://github.com/lxqt/libsysstat;
license = licenses.lgpl21Plus;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools,
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools,
qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lximage-qt";
version = "0.14.1";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libexif
];
meta = with stdenv.lib; {
meta = with lib; {
description = "The image viewer and screenshot tool for lxqt";
homepage = https://github.com/lxqt/lximage-qt;
license = licenses.gpl2;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-about";
version = "0.14.1";
@ -25,12 +25,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Dialogue window providing information about LXQt and the system it's running on";
homepage = https://github.com/lxqt/lxqt-about;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-admin";
version = "0.14.1";
@ -29,14 +29,9 @@ stdenv.mkDerivation rec {
postPatch = ''
sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
-i lxqt-admin-user/CMakeLists.txt
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 lib; {
description = "LXQt system administration tool";
homepage = https://github.com/lxqt/lxqt-admin;
license = licenses.lgpl21;

7
pkgs/desktops/lxqt/lxqt-archiver/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }:
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
mkDerivation rec {
pname = "lxqt-archiver";
version = "0.0.96";
@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Archive tool for the LXQt desktop environment";
homepage = https://github.com/lxqt/lxqt-archiver/;
license = licenses.gpl2;

7
pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake Normal file
View file

@ -0,0 +1,7 @@
add_definitions("-DLXQT_RELATIVE_SHARE_DIR=\"${LXQT_RELATIVE_SHARE_DIR}\"")
add_definitions("-DLXQT_SHARE_DIR=\"${LXQT_SHARE_DIR}\"")
add_definitions("-DLXQT_RELATIVE_SHARE_TRANSLATIONS_DIR=\"${LXQT_RELATIVE_TRANSLATIONS_DIR}\"")
add_definitions("-DLXQT_SHARE_TRANSLATIONS_DIR=\"${LXQT_TRANSLATIONS_DIR}\"")
add_definitions("-DLXQT_GRAPHICS_DIR=\"${LXQT_GRAPHICS_DIR}\"")
add_definitions("-DLXQT_ETC_XDG_DIR=\"${LXQT_ETC_XDG_DIR}\"")
add_definitions("-DLXQT_DATA_DIR=\"${LXQT_DATA_DIR}\"")

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-build-tools";
version = "0.6.0";
@ -11,13 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig setupHook ];
buildInputs = [ qtbase glib pcre ];
preConfigure = ''cmakeFlags+=" -DLXQT_ETC_XDG_DIR=$out/etc/xdg"'';
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; {
# We're dependent on this macro doing add_definitions in most places
# But we have the setup-hook to set the values.
postInstall = ''
rm $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
'';
meta = with lib; {
description = "Various packaging tools and scripts for LXQt applications";
homepage = https://github.com/lxqt/lxqt-build-tools;
license = licenses.lgpl21;

15
pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh Normal file
View file

@ -0,0 +1,15 @@
LXQtCMakePostHook() {
cmakeFlagsArray+=(
-DLXQT_LIBRARY_NAME=lxqt
-DLXQT_SHARE_DIR=$out/share/lxqt
-DLXQT_TRANSLATIONS_DIR=$out/share/lxqt/translations
-DLXQT_GRAPHICS_DIR=$out/share/lxqt/graphics
-DLXQT_ETC_XDG_DIR=$out/etc/xdg
-DLXQT_DATA_DIR=$out/share
-DLXQT_RELATIVE_SHARE_DIR=lxqt
-DLXQT_RELATIVE_SHARE_TRANSLATIONS_DIR=lxqt/translations
)
}
postHooks+=(LXQtCMakePostHook)

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

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase,
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase,
qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt,
libqtxdg, xorg }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-config";
version = "0.14.1";
@ -38,27 +38,10 @@ stdenv.mkDerivation rec {
];
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; {
meta = with lib; {
description = "Tools to configure LXQt and the underlying operating system";
homepage = https://github.com/lxqt/lxqt-config;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-globalkeys";
version = "0.14.1";
@ -26,17 +26,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
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; {
meta = with lib; {
description = "Daemon used to register global keyboard shortcuts";
homepage = https://github.com/lxqt/lxqt-globalkeys;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-notificationd";
version = "0.14.1";
@ -16,16 +16,6 @@ stdenv.mkDerivation rec {
lxqt-build-tools
];
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 = [
qtbase
qttools
@ -36,7 +26,7 @@ stdenv.mkDerivation rec {
qtx11extras
];
meta = with stdenv.lib; {
meta = with lib; {
description = "The LXQt notification daemon";
homepage = https://github.com/lxqt/lxqt-notificationd;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-openssh-askpass";
version = "0.14.1";
@ -26,12 +26,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "GUI to query passwords on behalf of SSH agents";
homepage = https://github.com/lxqt/lxqt-openssh-askpass;
license = licenses.lgpl21;

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

@ -1,5 +1,5 @@
{
stdenv, fetchFromGitHub,
lib, mkDerivation, fetchFromGitHub,
cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat,
@ -7,7 +7,7 @@
lxmenu-data, pcre, libXdamage
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-panel";
version = "0.14.1";
@ -49,21 +49,7 @@ stdenv.mkDerivation rec {
libXdamage
];
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"
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 lib; {
description = "The LXQt desktop panel";
homepage = https://github.com/lxqt/lxqt-panel;
license = licenses.lgpl21;

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

@ -1,10 +1,10 @@
{
stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
libqtxdg, pcre
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-policykit";
version = "0.14.1";
@ -33,15 +33,7 @@ stdenv.mkDerivation rec {
pcre
];
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; {
meta = with lib; {
description = "The LXQt PolicyKit agent";
homepage = https://github.com/lxqt/lxqt-policykit;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-powermanagement";
version = "0.14.1";
@ -28,17 +28,7 @@ stdenv.mkDerivation rec {
libqtxdg
];
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; {
meta = with lib; {
description = "Power management module for LXQt";
homepage = https://github.com/lxqt/lxqt-powermanagement;
license = licenses.lgpl21;

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

@ -1,10 +1,10 @@
{
stdenv, fetchFromGitHub,
lib, mkDerivation, fetchFromGitHub,
cmake, lxqt-build-tools,
qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-qtplugin";
version = "0.14.0";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "LXQt Qt platform integration plugin";
homepage = https://github.com/lxqt/lxqt-qtplugin;
license = licenses.lgpl21;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras,
menu-cache, muparser, pcre }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-runner";
version = "0.14.1";
@ -32,15 +32,7 @@ stdenv.mkDerivation rec {
pcre
];
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; {
meta = with lib; {
description = "Tool used to launch programs quickly by typing their names";
homepage = https://github.com/lxqt/lxqt-runner;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-session";
version = "0.14.1";
@ -30,19 +30,7 @@ stdenv.mkDerivation rec {
xdg-user-dirs
];
postPatch = ''
for dir in autostart config; do
substituteInPlace $dir/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
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 lib; {
description = "An alternative session manager ported from the original razor-session";
homepage = https://github.com/lxqt/lxqt-session;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-sudo";
version = "0.14.1";
@ -27,12 +27,7 @@ stdenv.mkDerivation rec {
sudo
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "\''${LXQT_TRANSLATIONS_DIR}" "''${out}/share/lxqt/translations"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "GUI frontend for sudo/su";
homepage = https://github.com/lxqt/lxqt-sudo;
license = licenses.lgpl21;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools }:
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lxqt-themes";
version = "0.14.0";
@ -16,14 +16,7 @@ stdenv.mkDerivation rec {
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; {
meta = with lib; {
description = "Themes, graphics and icons for LXQt";
homepage = https://github.com/lxqt/lxqt-themes;
license = licenses.lgpl21;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools,
qtx11extras, xorg, lxqt-build-tools, openbox, hicolor-icon-theme }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "obconf-qt";
version = "0.14.1";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
hicolor-icon-theme
];
meta = with stdenv.lib; {
meta = with lib; {
description = "The Qt port of obconf, the Openbox configuration tool";
homepage = https://github.com/lxqt/obconf-qt;
license = licenses.gpl2;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
pcre, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "pavucontrol-qt";
version = "0.14.1";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
pcre
];
meta = with stdenv.lib; {
meta = with lib; {
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
homepage = https://github.com/lxqt/pavucontrol-qt;
license = licenses.gpl2;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools,
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools,
qtx11extras, libfm-qt, menu-cache, lxmenu-data }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "pcmanfm-qt";
version = "0.14.1";
@ -28,14 +28,7 @@ stdenv.mkDerivation rec {
lxmenu-data
];
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; {
meta = with lib; {
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
homepage = https://github.com/lxqt/pcmanfm-qt;
license = licenses.gpl2;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, qtbase, qttools }:
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }:
stdenv.mkDerivation rec {
mkDerivation rec {
name = "${pname}-${version}";
pname = "qlipper";
version = "5.1.1";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qttools ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Cross-platform clipboard history applet";
homepage = https://github.com/pvanek/qlipper;
license = licenses.gpl2Plus;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools,
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools,
lxqt-build-tools }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "qps";
version = "1.10.20";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtx11extras qttools ];
meta = with stdenv.lib; {
meta = with lib; {
description = "The Qt process manager";
homepage = https://github.com/lxqt/qps;
license = licenses.gpl2;

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget,
{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget,
qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "qterminal";
version = "0.14.1";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
qtermwidget
];
meta = with stdenv.lib; {
meta = with lib; {
description = "A lightweight Qt-based terminal emulator";
homepage = https://github.com/lxqt/qterminal;
license = licenses.gpl2;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }:
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "qtermwidget";
version = "0.14.1";
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake lxqt-build-tools ];
buildInputs = [ qtbase qttools];
buildInputs = [ qtbase qttools ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A terminal emulator widget for Qt 5";
homepage = https://github.com/lxqt/qtermwidget;
license = licenses.gpl2;

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }:
{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "screengrab";
version = "1.101";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
xorg.libXdmcp
];
meta = with stdenv.lib; {
meta = with lib; {
description = "Crossplatform tool for fast making screenshots";
homepage = https://github.com/lxqt/screengrab;
license = licenses.gpl2;