diff options
| -rw-r--r-- | pkgs/desktops/lumina/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 77b47533d537..da33999087ed 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,21 +1,23 @@ -{ 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 = [ @@ -26,6 +28,7 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras + poppler_qt5 fluxbox xscreensaver desktop_file_utils @@ -44,12 +47,24 @@ stdenv.mkDerivation rec { ''; 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; |