Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lumina.lumina: 1.6.1 -> 1.6.2 #152363

Merged
merged 5 commits into from
Jan 1, 2022
Merged

lumina.lumina: 1.6.1 -> 1.6.2 #152363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20c8631
lumina.lumina: 1.6.1 -> 1.6.2
romildo Dec 27, 2021
a31ae59
lumina.lumina: lumina-checkpass is postponned by upstream
romildo Dec 27, 2021
e012556
lumina.lumina: update icon theme caches
romildo Dec 27, 2021
6c41f9d
lumina.lumina: remove unneeded patch
romildo Dec 27, 2021
8d29fde
lumina.lumina: do not change the desktop name
romildo Dec 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions nixos/modules/services/x11/desktop-managers/lumina.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,5 @@ in
"/share"
];

security.wrappers.lumina-checkpass-wrapped = {
source = "${pkgs.lumina.lumina}/bin/lumina-checkpass";
owner = "root";
group = "root";
};

};
}
11 changes: 0 additions & 11 deletions pkgs/desktops/lumina/lumina/avoid-absolute-path-on-sessdir.patch
View file
Open in desktop

This file was deleted.

25 changes: 14 additions & 11 deletions pkgs/desktops/lumina/lumina/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
, mkDerivation
, fetchFromGitHub
, fluxbox
, hicolor-icon-theme
, libarchive
, linux-pam
, numlockx
, qmake
, qtbase
Expand All @@ -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 = [
Expand All @@ -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
Expand All @@ -50,6 +50,8 @@ mkDerivation rec {
xscreensaver
];

dontDropIconThemeCache = true;

patches = [
./LuminaOS-NixOS.cpp.patch
];
Expand All @@ -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"
Expand All @@ -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
'';

Expand Down