mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

Merge pull request #142360 from romildo/upd.lumina

Browse source
This commit is contained in:
Sandro 2021-10-21 23:45:29 +02:00 committed by GitHub
parent 5c994463bf 247f3876d5
commit 4663d3f99f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/x11/desktop-managers/lumina.nix
View file

@ -38,5 +38,11 @@ in
"/share"
];
security.wrappers.lumina-checkpass-wrapped = {
source = "${pkgs.lumina.lumina}/bin/lumina-checkpass";
owner = "root";
group = "root";
};
};
}

15
pkgs/desktops/lumina/lumina/default.nix
View file

@ -3,6 +3,7 @@
, fetchFromGitHub
, fluxbox
, libarchive
, linux-pam
, numlockx
, qmake
, qtbase
@ -17,13 +18,13 @@
mkDerivation rec {
pname = "lumina";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "lumina-desktop";
repo = pname;
rev = "v${version}";
sha256 = "0bvs12c9pkc6fnkfcr7rrxc8jfbzbslch4nlfjrzwi203fcv4avw";
sha256 = "0wc8frhw1yv07n05r33c4zilq5lgn5gw07a9n37g6nyn5sgrbp4f";
};
nativeBuildInputs = [
@ -35,6 +36,7 @@ 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
@ -49,7 +51,6 @@ mkDerivation rec {
];
patches = [
./avoid-absolute-path-on-sessdir.patch
./LuminaOS-NixOS.cpp.patch
];
@ -60,6 +61,14 @@ mkDerivation rec {
'';
postPatch = ''
# Avoid absolute path on sessdir
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"