diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-24 18:04:26 -0200 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-30 16:23:59 -0200 |
| commit | 0345e5d576434e23961cdab994730d6e10bad364 (patch) | |
| tree | 9b28a7a17e0ebe449ee7001815821324328644bc /pkgs/desktops/lumina | |
| parent | 3ad0845fb024fc16bb4c2648e3fe68c5252aea75 (diff) | |
| download | nixpkgs-0345e5d576434e23961cdab994730d6e10bad364.tar nixpkgs-0345e5d576434e23961cdab994730d6e10bad364.tar.gz nixpkgs-0345e5d576434e23961cdab994730d6e10bad364.tar.bz2 nixpkgs-0345e5d576434e23961cdab994730d6e10bad364.tar.lz nixpkgs-0345e5d576434e23961cdab994730d6e10bad364.tar.xz nixpkgs-0345e5d576434e23961cdab994730d6e10bad364.tar.zst nixpkgs-0345e5d576434e23961cdab994730d6e10bad364.zip | |
lumina: 1.3.0 -> 1.4.0-p1
Diffstat (limited to 'pkgs/desktops/lumina')
| -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 77b47533d53..da33999087e 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; |