mirror of
https://github.com/aviallon/nixos-lib.git
synced 2026-04-06 01:38:06 +00:00
[Desktop/Plasma] update SDDM to use last commit from master
Current version is way too old, and doesn't support Wayland
This commit is contained in:
parent
52a043f724
commit
d120a3801b
1 changed files with 25 additions and 2 deletions
|
|
@ -3,8 +3,28 @@ with lib;
|
||||||
let
|
let
|
||||||
cfg = config.aviallon.desktop;
|
cfg = config.aviallon.desktop;
|
||||||
optimizeCfg = config.aviallon.optimizations;
|
optimizeCfg = config.aviallon.optimizations;
|
||||||
sddmOptimized = optimizeCfg.optimizePkg { recursive = 0; } pkgs.sddm;
|
_sddm = pkgs.sddm.overrideAttrs (old: rec {
|
||||||
sddmPackage = if optimizeCfg.enable then sddmOptimized else pkgs.sddm;
|
pname = old.pname + "-git";
|
||||||
|
version = "2023-05-12";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "sddm";
|
||||||
|
repo = "sddm";
|
||||||
|
rev = "58a35178b75aada974088350f9b89db45f5c3800";
|
||||||
|
sha256 = "sha256-lTfsMUnYu3E2L25FSrMDkh9gB5X2fC0a5rvpMnPph4k=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = traceVal (filter (x: hasSuffix "sddm-ignore-config-mtime.patch" x) old.patches);
|
||||||
|
|
||||||
|
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.docutils ];
|
||||||
|
|
||||||
|
cmakeFlags = old.cmakeFlags ++ [
|
||||||
|
"-DBUILD_MAN_PAGES=ON"
|
||||||
|
"-DSYSTEMD_TMPFILES_DIR=${placeholder "out"}/etc/tmpfiles.d"
|
||||||
|
"-DSYSTEMD_SYSUSERS_DIR=${placeholder "out"}/lib/sysusers.d"
|
||||||
|
];
|
||||||
|
});
|
||||||
|
sddmOptimized = optimizeCfg.optimizePkg { recursive = 0; } _sddm;
|
||||||
|
sddmPackage = if optimizeCfg.enable then sddmOptimized else _sddm;
|
||||||
in {
|
in {
|
||||||
config = mkIf (cfg.enable && (cfg.environment == "plasma")) {
|
config = mkIf (cfg.enable && (cfg.environment == "plasma")) {
|
||||||
# Enable the Plasma 5 Desktop Environment.
|
# Enable the Plasma 5 Desktop Environment.
|
||||||
|
|
@ -45,6 +65,8 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixpkgs.overlays = [(final: prev: { mySddm = sddmPackage; } )];
|
||||||
|
|
||||||
services.xserver.displayManager.job = {
|
services.xserver.displayManager.job = {
|
||||||
execCmd = mkForce "exec ${sddmPackage}/bin/sddm";
|
execCmd = mkForce "exec ${sddmPackage}/bin/sddm";
|
||||||
};
|
};
|
||||||
|
|
@ -70,6 +92,7 @@ in {
|
||||||
ark
|
ark
|
||||||
kolourpaint
|
kolourpaint
|
||||||
krdc
|
krdc
|
||||||
|
sddm-kcm
|
||||||
|
|
||||||
libreoffice-qt
|
libreoffice-qt
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue