diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2019-05-24 10:04:44 -0300 |
---|---|---|
committer | José Romildo Malaquias <malaquias@gmail.com> | 2019-05-24 17:20:15 -0300 |
commit | 1a8005393dccbc1163fd5872da4cd1dece1b2a70 (patch) | |
tree | 9a631a218042bf44371efe4132921e21b1b445a3 /pkgs/desktops/lumina | |
parent | 272fa9d41caf3af41d2f14e6016c47443f421245 (diff) |
lumina.lumina: 1.4.0-p1 -> 1.5.0
Diffstat (limited to 'pkgs/desktops/lumina')
-rw-r--r-- | pkgs/desktops/lumina/lumina/default.nix | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 00ebfd8a7253..c758fc38a1b9 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, - numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, - qttools, poppler, wrapGAppsHook +{ stdenv, + fetchFromGitHub, + desktop-file-utils, + fluxbox, + numlockx, + qmake, + qtbase, + qtmultimedia, + qtsvg, + qttools, + qtx11extras, + xorg, + xscreensaver, + wrapGAppsHook }: stdenv.mkDerivation rec { - name = "lumina-${version}"; - version = "1.4.0-p1"; + pname = "lumina"; + version = "1.5.0"; src = fetchFromGitHub { - owner = "trueos"; - repo = "lumina"; + owner = "lumina-desktop"; + repo = pname; rev = "v${version}"; - sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp"; + sha256 = "0rj2gzifr98db7i82cg3hg7l5yfik810pjpawg6n54qbzq987z25"; }; nativeBuildInputs = [ @@ -22,6 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libxcb + xorg.libXcursor xorg.libXdamage xorg.xcbutilwm xorg.xcbutilimage @@ -29,7 +41,6 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras - poppler fluxbox xscreensaver desktop-file-utils @@ -48,10 +59,6 @@ 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" @@ -67,8 +74,6 @@ stdenv.mkDerivation rec { "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A lightweight, portable desktop environment"; longDescription = '' |