lol

Merge pull request #32013 from romildo/upd.lumina

lumina: 1.3.0 -> 1.4.0-p1

authored by

Jörg Thalheim and committed by
GitHub
ef893323 cc1d7a35

+20 -5
+20 -5
pkgs/desktops/lumina/default.nix
··· 1 - { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx, 2 - xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools 1 + { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, 2 + numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, 3 + qttools, poppler_qt5, wrapGAppsHook 3 4 }: 4 5 5 6 stdenv.mkDerivation rec { 6 7 name = "lumina-${version}"; 7 - version = "1.3.0"; 8 + version = "1.4.0-p1"; 8 9 9 10 src = fetchFromGitHub { 10 11 owner = "trueos"; 11 12 repo = "lumina"; 12 13 rev = "v${version}"; 13 - sha256 = "13kwlhv2qscrn52xvx0n1sqbl96fkcb5r1ixa0wazflx8dfl9ndn"; 14 + sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp"; 14 15 }; 15 16 16 17 nativeBuildInputs = [ 17 18 qmake 18 19 qttools 20 + wrapGAppsHook 19 21 ]; 20 22 21 23 buildInputs = [ ··· 26 28 qtsvg 27 29 qtmultimedia 28 30 qtx11extras 31 + poppler_qt5 29 32 fluxbox 30 33 xscreensaver 31 34 desktop_file_utils ··· 44 47 ''; 45 48 46 49 postPatch = '' 50 + # Fix location of poppler-qt5.h 51 + substituteInPlace src-qt5/desktop-utils/lumina-pdf/mainUI.h \ 52 + --replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>' 53 + 54 + # Fix plugin dir 55 + substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \ 56 + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" 57 + 47 58 # Fix location of fluxbox styles 48 59 substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ 49 60 --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" 50 61 ''; 51 62 52 - qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" ]; 63 + qmakeFlags = [ 64 + "LINUX_DISTRO=NixOS" 65 + "CONFIG+=WITH_I18N" 66 + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" 67 + ]; 53 68 54 69 enableParallelBuilding = true; 55 70