Merge pull request #32013 from romildo/upd.lumina

lumina: 1.3.0 -> 1.4.0-p1

Changed files
+20 -5
pkgs
desktops
lumina
+20 -5
pkgs/desktops/lumina/default.nix
···
-
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
-
xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools
+
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils,
+
numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake,
+
qttools, poppler_qt5, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "lumina-${version}";
-
version = "1.3.0";
+
version = "1.4.0-p1";
src = fetchFromGitHub {
owner = "trueos";
repo = "lumina";
rev = "v${version}";
-
sha256 = "13kwlhv2qscrn52xvx0n1sqbl96fkcb5r1ixa0wazflx8dfl9ndn";
+
sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp";
};
nativeBuildInputs = [
qmake
qttools
+
wrapGAppsHook
];
buildInputs = [
···
qtsvg
qtmultimedia
qtx11extras
+
poppler_qt5
fluxbox
xscreensaver
desktop_file_utils
···
'';
postPatch = ''
+
# Fix location of poppler-qt5.h
+
substituteInPlace src-qt5/desktop-utils/lumina-pdf/mainUI.h \
+
--replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>'
+
+
# Fix plugin dir
+
substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \
+
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+
# Fix location of fluxbox styles
substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \
--replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"
'';
-
qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" ];
+
qmakeFlags = [
+
"LINUX_DISTRO=NixOS"
+
"CONFIG+=WITH_I18N"
+
"LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
+
];
enableParallelBuilding = true;