From dd5a92a1fbddd1e9bb22c0e66f4fcb84672484bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 24 May 2019 08:33:26 -0300 Subject: [PATCH 1/5] lumina: move to pkgs/desktops/lumina/lumina --- pkgs/desktops/lumina/{ => lumina}/LuminaOS-NixOS.cpp.patch | 0 .../lumina/{ => lumina}/avoid-absolute-path-on-sessdir.patch | 0 pkgs/desktops/lumina/{ => lumina}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/lumina/{ => lumina}/LuminaOS-NixOS.cpp.patch (100%) rename pkgs/desktops/lumina/{ => lumina}/avoid-absolute-path-on-sessdir.patch (100%) rename pkgs/desktops/lumina/{ => lumina}/default.nix (100%) diff --git a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch b/pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch similarity index 100% rename from pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch rename to pkgs/desktops/lumina/lumina/LuminaOS-NixOS.cpp.patch diff --git a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch similarity index 100% rename from pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch rename to pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix similarity index 100% rename from pkgs/desktops/lumina/default.nix rename to pkgs/desktops/lumina/lumina/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e23e812db2e..7779f2b7871 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22038,7 +22038,7 @@ in kakasi = callPackage ../tools/text/kakasi { }; - lumina = libsForQt5.callPackage ../desktops/lumina { }; + lumina = libsForQt5.callPackage ../desktops/lumina/lumina { }; lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs libsForQt5; From 272fa9d41caf3af41d2f14e6016c47443f421245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 24 May 2019 10:02:07 -0300 Subject: [PATCH 2/5] lumina: init package set for the lumina desktop --- .../services/x11/desktop-managers/lumina.nix | 13 ++++------- pkgs/desktops/lumina/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 pkgs/desktops/lumina/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index 43fed2572b5..957b6ab63bb 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -26,18 +26,13 @@ in services.xserver.desktopManager.session = singleton { name = "lumina"; start = '' - exec ${pkgs.lumina}/bin/start-lumina-desktop + exec ${pkgs.lumina.lumina}/bin/start-lumina-desktop ''; }; - environment.systemPackages = [ - pkgs.fluxbox - pkgs.libsForQt5.kwindowsystem - pkgs.lumina - pkgs.numlockx - pkgs.qt5.qtsvg - pkgs.xscreensaver - ]; + environment.systemPackages = + pkgs.lumina.preRequisitePackages ++ + pkgs.lumina.corePackages; # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix new file mode 100644 index 00000000000..d1737930b4c --- /dev/null +++ b/pkgs/desktops/lumina/default.nix @@ -0,0 +1,22 @@ +{ pkgs, libsForQt5 }: + +let + packages = self: with self; { + + lumina = callPackage ./lumina { }; + + preRequisitePackages = [ + pkgs.fluxbox + pkgs.libsForQt5.kwindowsystem + pkgs.numlockx + pkgs.qt5.qtsvg + pkgs.xscreensaver + ]; + + corePackages = [ + lumina + ]; + + }; + +in pkgs.lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7779f2b7871..5d42bdffbfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22038,7 +22038,7 @@ in kakasi = callPackage ../tools/text/kakasi { }; - lumina = libsForQt5.callPackage ../desktops/lumina/lumina { }; + lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs libsForQt5; From 1a8005393dccbc1163fd5872da4cd1dece1b2a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 24 May 2019 10:04:44 -0300 Subject: [PATCH 3/5] lumina.lumina: 1.4.0-p1 -> 1.5.0 --- pkgs/desktops/lumina/lumina/default.nix | 35 ++++++++++++++----------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 00ebfd8a725..c758fc38a1b 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 ' '#include ' - # 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 = '' From c345f347d146f698698bac2501f64c5ca541c60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 24 May 2019 17:22:21 -0300 Subject: [PATCH 4/5] lumina.lumina-calculator: init at 2019-04-27 --- pkgs/desktops/lumina/default.nix | 2 ++ .../lumina/lumina-calculator/default.nix | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/desktops/lumina/lumina-calculator/default.nix diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index d1737930b4c..9bdf221c96d 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -4,6 +4,7 @@ let packages = self: with self; { lumina = callPackage ./lumina { }; + lumina-calculator = callPackage ./lumina-calculator { }; preRequisitePackages = [ pkgs.fluxbox @@ -15,6 +16,7 @@ let corePackages = [ lumina + lumina-calculator ]; }; diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix new file mode 100644 index 00000000000..70e0f2e3511 --- /dev/null +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }: + +stdenv.mkDerivation rec { + pname = "lumina-calculator"; + version = "2019-04-27"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "ccb792fc713aa7163fffd37fc20c83ffe9ca7523"; + sha256 = "0cdyz94znycsc3qxg5bmg51bwms7586d4ja1bsmj8cb9pd3lv980"; + }; + + sourceRoot = "source/src-qt5"; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase ]; + + qmakeFlags = [ + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + meta = with stdenv.lib; { + description = "Scientific calculator for the Lumina Desktop"; + homepage = https://github.com/lumina-desktop/lumina-calculator; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} From e2c77cd9cb383afa281694974b0c34aa3858a742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 24 May 2019 18:14:46 -0300 Subject: [PATCH 5/5] lumina.lumina-pdf: init at 2019-04-27 --- pkgs/desktops/lumina/default.nix | 2 ++ pkgs/desktops/lumina/lumina-pdf/default.nix | 38 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/desktops/lumina/lumina-pdf/default.nix diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 9bdf221c96d..10e75eea38f 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -5,6 +5,7 @@ let lumina = callPackage ./lumina { }; lumina-calculator = callPackage ./lumina-calculator { }; + lumina-pdf = callPackage ./lumina-pdf { }; preRequisitePackages = [ pkgs.fluxbox @@ -17,6 +18,7 @@ let corePackages = [ lumina lumina-calculator + lumina-pdf ]; }; diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix new file mode 100644 index 00000000000..62d59d18cc5 --- /dev/null +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, poppler }: + +stdenv.mkDerivation rec { + pname = "lumina-pdf"; + version = "2019-04-27"; + + src = fetchFromGitHub { + owner = "lumina-desktop"; + repo = pname; + rev = "645ed591ef91c3607d3ab87dd86f7acfd08b05c9"; + sha256 = "0gl943jb9c9rcgb5wksx3946hwlifghfd27r97skm9is8ih6k0vn"; + }; + + sourceRoot = "source/src-qt5"; + + nativeBuildInputs = [ qmake qttools ]; + + buildInputs = [ qtbase poppler ]; + + postPatch = '' + sed -i '1i\#include \' Renderer-poppler.cpp + ''; + + qmakeFlags = [ + "CONFIG+=WITH_I18N" + "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + ]; + + enableParallelBuilding = false; + + meta = with stdenv.lib; { + description = "PDF viewer for the Lumina Desktop"; + homepage = https://github.com/lumina-desktop/lumina-pdf; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +}