From 20c863185da8cb54d5b3a2c30d1d227dd42dba48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 27 Dec 2021 13:14:19 -0300 Subject: [PATCH 1/5] lumina.lumina: 1.6.1 -> 1.6.2 --- pkgs/desktops/lumina/lumina/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index b56e9c4bc2f8..3fc7ee6fd29b 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lumina"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "lumina-desktop"; repo = pname; rev = "v${version}"; - sha256 = "0wc8frhw1yv07n05r33c4zilq5lgn5gw07a9n37g6nyn5sgrbp4f"; + sha256 = "1llr65gilcf0k88f9mbwzlalqwdnjy4nv2jq7w154z0xmd6iarfq"; }; nativeBuildInputs = [ @@ -81,6 +81,10 @@ mkDerivation rec { substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \ --replace '"bsdtar"' '"${lib.getBin libarchive}/bin/bsdtar"' + # Fix installation path of lumina-sudo + substituteInPlace src-qt5/desktop-utils/lumina-sudo/lumina-sudo.pro \ + --replace "/usr/bin" "$out/bin" + # Fix desktop files for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina' From a31ae59bb2ec853955f4442a1761f59b716a818a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 27 Dec 2021 15:45:02 -0300 Subject: [PATCH 2/5] lumina.lumina: lumina-checkpass is postponned by upstream --- nixos/modules/services/x11/desktop-managers/lumina.nix | 6 ------ pkgs/desktops/lumina/lumina/default.nix | 6 ------ 2 files changed, 12 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index 1ab61953e735..419f5055d8be 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -38,11 +38,5 @@ in "/share" ]; - security.wrappers.lumina-checkpass-wrapped = { - source = "${pkgs.lumina.lumina}/bin/lumina-checkpass"; - owner = "root"; - group = "root"; - }; - }; } diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 3fc7ee6fd29b..61a3b5386622 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fluxbox , libarchive -, linux-pam , numlockx , qmake , qtbase @@ -36,7 +35,6 @@ mkDerivation rec { buildInputs = [ fluxbox # window manager for Lumina DE libarchive # make `bsdtar` available for lumina-archiver - linux-pam numlockx # required for changing state of numlock at login qtbase qtmultimedia @@ -65,10 +63,6 @@ mkDerivation rec { substituteInPlace src-qt5/OS-detect.pri \ --replace L_SESSDIR=/usr/share/xsessions '#L_SESSDIR=/usr/share/xsessions' - # Do not set special permission - substituteInPlace src-qt5/core/lumina-checkpass/lumina-checkpass.pro \ - --replace "chmod 4555" "chmod 555" - # Fix plugin dir substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" From e012556e455558a8b7be57c392613c56fa9973eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 27 Dec 2021 16:01:55 -0300 Subject: [PATCH 3/5] lumina.lumina: update icon theme caches --- pkgs/desktops/lumina/lumina/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 61a3b5386622..87a93e5935aa 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -2,6 +2,7 @@ , mkDerivation , fetchFromGitHub , fluxbox +, hicolor-icon-theme , libarchive , numlockx , qmake @@ -34,6 +35,7 @@ mkDerivation rec { buildInputs = [ fluxbox # window manager for Lumina DE + hicolor-icon-theme libarchive # make `bsdtar` available for lumina-archiver numlockx # required for changing state of numlock at login qtbase @@ -48,6 +50,8 @@ mkDerivation rec { xscreensaver ]; + dontDropIconThemeCache = true; + patches = [ ./LuminaOS-NixOS.cpp.patch ]; @@ -85,6 +89,12 @@ mkDerivation rec { done ''; + postInstall = '' + for theme in lumina-icons material-design-{dark,light}; do + gtk-update-icon-cache $out/share/icons/$theme + done + ''; + qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" From 6c41f9d7a57caa6484b61fe25ae86536c27df377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 27 Dec 2021 16:27:33 -0300 Subject: [PATCH 4/5] lumina.lumina: remove unneeded patch --- .../lumina/avoid-absolute-path-on-sessdir.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch diff --git a/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch deleted file mode 100644 index f5ef6cba41f6..000000000000 --- a/pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri ---- lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri 2016-08-09 12:04:30.000000000 -0300 -+++ lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri 2016-08-13 17:32:18.272137900 -0300 -@@ -55,7 +55,6 @@ - #Use the defaults for everything else - - }else : linux-*{ -- L_SESSDIR=/usr/share/xsessions - OS=Linux - LIBS += -L/usr/local/lib -L/usr/lib -L/lib - From 8d29fdeaee65c79ff6bf8025e0018430f8d0f5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 31 Dec 2021 20:40:30 -0300 Subject: [PATCH 5/5] lumina.lumina: do not change the desktop name --- pkgs/desktops/lumina/lumina/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 87a93e5935aa..54a39ded409a 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -82,11 +82,6 @@ mkDerivation rec { # Fix installation path of lumina-sudo substituteInPlace src-qt5/desktop-utils/lumina-sudo/lumina-sudo.pro \ --replace "/usr/bin" "$out/bin" - - # Fix desktop files - for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do - substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina' - done ''; postInstall = ''