git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #152363 from romildo/upd.lumina
commit1190803e089262ac5c25f8ec380e77fc3b6e6fd6 authorSandro <sandro.jaeckel@gmail.com> dateSat 1 Jan 2022, 14:39 (5 years ago) parenteebef8a8d29fde
3 files changed+14−28
compare with master
unifiedsplit
nixos/modules/services/x11/desktop-managers/lumina.nix−6 pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch−11 pkgs/desktops/lumina/lumina/default.nix+14−11
nixos/modules/services/x11/desktop-managers/lumina.nix−6
@@ -38,11 +38,5 @@ in
3838 "/share"
3939 ];
4040
41− security.wrappers.lumina-checkpass-wrapped = {
42− source = "${pkgs.lumina.lumina}/bin/lumina-checkpass";
43− owner = "root";
44− group = "root";
45− };
46−
4741 };
4842}
pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patchdeleted−11
@@ -1,11 +0,0 @@
1−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
2−--- lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri 2016-08-09 12:04:30.000000000 -0300
3−+++ lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri 2016-08-13 17:32:18.272137900 -0300
4−@@ -55,7 +55,6 @@
5− #Use the defaults for everything else
6−
7− }else : linux-*{
8−- L_SESSDIR=/usr/share/xsessions
9− OS=Linux
10− LIBS += -L/usr/local/lib -L/usr/lib -L/lib
11−
pkgs/desktops/lumina/lumina/default.nix+14−11
@@ -2,8 +2,8 @@
22, mkDerivation
33, fetchFromGitHub
44, fluxbox
5+, hicolor-icon-theme
56, libarchive
6−, linux-pam
77, numlockx
88, qmake
99, qtbase
@@ -18,13 +18,13 @@
1818
1919mkDerivation rec {
2020 pname = "lumina";
21− version = "1.6.1";
21+ version = "1.6.2";
2222
2323 src = fetchFromGitHub {
2424 owner = "lumina-desktop";
2525 repo = pname;
2626 rev = "v${version}";
27− sha256 = "0wc8frhw1yv07n05r33c4zilq5lgn5gw07a9n37g6nyn5sgrbp4f";
27+ sha256 = "1llr65gilcf0k88f9mbwzlalqwdnjy4nv2jq7w154z0xmd6iarfq";
2828 };
2929
3030 nativeBuildInputs = [
@@ -35,8 +35,8 @@ mkDerivation rec {
3535
3636 buildInputs = [
3737 fluxbox # window manager for Lumina DE
38+ hicolor-icon-theme
3839 libarchive # make `bsdtar` available for lumina-archiver
39− linux-pam
4040 numlockx # required for changing state of numlock at login
4141 qtbase
4242 qtmultimedia
@@ -50,6 +50,8 @@ mkDerivation rec {
5050 xscreensaver
5151 ];
5252
53+ dontDropIconThemeCache = true;
54+
5355 patches = [
5456 ./LuminaOS-NixOS.cpp.patch
5557 ];
@@ -65,10 +67,6 @@ mkDerivation rec {
6567 substituteInPlace src-qt5/OS-detect.pri \
6668 --replace L_SESSDIR=/usr/share/xsessions '#L_SESSDIR=/usr/share/xsessions'
6769
68− # Do not set special permission
69− substituteInPlace src-qt5/core/lumina-checkpass/lumina-checkpass.pro \
70− --replace "chmod 4555" "chmod 555"
71−
7270 # Fix plugin dir
7371 substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \
7472 --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
@@ -81,9 +79,14 @@ mkDerivation rec {
8179 substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \
8280 --replace '"bsdtar"' '"${lib.getBin libarchive}/bin/bsdtar"'
8381
84− # Fix desktop files
85− for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do
86− substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina'
82+ # Fix installation path of lumina-sudo
83+ substituteInPlace src-qt5/desktop-utils/lumina-sudo/lumina-sudo.pro \
84+ --replace "/usr/bin" "$out/bin"
85+ '';
86+
87+ postInstall = ''
88+ for theme in lumina-icons material-design-{dark,light}; do
89+ gtk-update-icon-cache $out/share/icons/$theme
8790 done
8891 '';
8992