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/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 - diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index b56e9c4bc2f8..54a39ded409a 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -2,8 +2,8 @@ , mkDerivation , fetchFromGitHub , fluxbox +, hicolor-icon-theme , libarchive -, linux-pam , numlockx , qmake , qtbase @@ -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 = [ @@ -35,8 +35,8 @@ mkDerivation rec { buildInputs = [ fluxbox # window manager for Lumina DE + hicolor-icon-theme libarchive # make `bsdtar` available for lumina-archiver - linux-pam numlockx # required for changing state of numlock at login qtbase qtmultimedia @@ -50,6 +50,8 @@ mkDerivation rec { xscreensaver ]; + dontDropIconThemeCache = true; + patches = [ ./LuminaOS-NixOS.cpp.patch ]; @@ -65,10 +67,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" @@ -81,9 +79,14 @@ mkDerivation rec { substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \ --replace '"bsdtar"' '"${lib.getBin libarchive}/bin/bsdtar"' - # Fix desktop files - for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do - substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina' + # Fix installation path of lumina-sudo + substituteInPlace src-qt5/desktop-utils/lumina-sudo/lumina-sudo.pro \ + --replace "/usr/bin" "$out/bin" + ''; + + postInstall = '' + for theme in lumina-icons material-design-{dark,light}; do + gtk-update-icon-cache $out/share/icons/$theme done '';