sddm: take themes from system environment

This commit is contained in:
Thomas Tuegel 2017-05-17 09:21:11 -05:00
parent be7b7d908f
commit 870c07cc2b
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
7 changed files with 91 additions and 126 deletions

View File

@ -190,7 +190,6 @@ in
services.xserver.displayManager.sddm = {
theme = "breeze";
package = pkgs.sddmPlasma5;
};
security.pam.services.kde = { allowNullPassword = true; };

View File

@ -9,7 +9,7 @@ let
cfg = dmcfg.sddm;
xEnv = config.systemd.services."display-manager".environment;
sddm = cfg.package;
inherit (pkgs) sddm;
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
@ -37,8 +37,8 @@ let
[Theme]
Current=${cfg.theme}
ThemeDir=${sddm}/share/sddm/themes
FacesDir=${sddm}/share/sddm/faces
ThemeDir=/run/current-system/sw/share/sddm/themes
FacesDir=/run/current-system/sw/share/sddm/faces
[Users]
MaximumUid=${toString config.ids.uids.nixbld}
@ -105,15 +105,6 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.sddm;
description = ''
The SDDM package to install.
The default package can be overridden to provide extra themes.
'';
};
autoNumlock = mkOption {
type = types.bool;
default = false;
@ -205,7 +196,13 @@ in
services.xserver.displayManager.job = {
logsXsession = true;
execCmd = "exec ${sddm}/bin/sddm";
environment = {
# Take themes system environment
NIX_PROFILES = "/run/current-system/sw";
XDG_DATA_DIRS = "/run/current-system/sw/share";
};
execCmd = "exec /run/current-system/sw/bin/sddm";
};
security.pam.services = {
@ -254,7 +251,8 @@ in
users.extraGroups.sddm.gid = config.ids.gids.sddm;
services.dbus.packages = [ sddm.unwrapped ];
environment.systemPackages = [ sddm ];
services.dbus.packages = [ sddm ];
# To enable user switching, allow sddm to allocate TTYs/displays dynamically.
services.xserver.tty = null;

View File

@ -1,121 +1,72 @@
{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
, themes
}:
let
version = "0.14.0";
unwrapped = stdenv.mkDerivation rec {
name = "sddm-unwrapped-${version}";
src = fetchFromGitHub {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
};
patches = [
./0001-ignore-config-mtime.patch
(fetchpatch { /* Fix display of user avatars. */
url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
})
];
postPatch =
# Module Qt5::Test must be included in `find_package` before it is used.
''
sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
'';
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [
libxcb libpthreadstubs libXdmcp libXau pam systemd
];
propagatedBuildInputs = [
qtbase qtdeclarative
];
cmakeFlags = [
"-DCONFIG_FILE=/etc/sddm.conf"
# Set UID_MIN and UID_MAX so that the build script won't try
# to read them from /etc/login.defs (fails in chroot).
# The values come from NixOS; they may not be appropriate
# for running SDDM outside NixOS, but that configuration is
# not supported anyway.
"-DUID_MIN=1000"
"-DUID_MAX=29999"
];
preConfigure = ''
export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
'';
enableParallelBuilding = true;
postInstall = ''
# remove empty scripts
rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
'';
meta = with stdenv.lib; {
description = "QML based X11 display manager";
homepage = "https://github.com/sddm/sddm";
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ttuegel ];
};
/* Fix display of user avatars. */
patchFixUserAvatars = fetchpatch {
url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
};
in
in mkDerivation rec {
name = "sddm-unwrapped-${version}";
stdenv.mkDerivation {
name = "sddm-${version}";
src = fetchFromGitHub {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
};
nativeBuildInputs = [ lndir makeQtWrapper ];
buildInputs = [ unwrapped ] ++ themes;
themes = map (pkg: pkg.out or pkg) themes;
inherit unwrapped;
patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series)
++ [ patchFixUserAvatars ];
unpackPhase = "true";
configurePhase = "runHook preConfigure; runHook postConfigure";
buildPhase = "runHook preBuild; runHook postBuild";
postPatch =
# Module Qt5::Test must be included in `find_package` before it is used.
''
sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
'';
installPhase = ''
runHook preInstall
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
propagated=
for i in $unwrapped $themes; do
findInputs $i propagated propagated-user-env-packages
if [ -z "$crossConfig" ]; then
findInputs $i propagated propagated-native-build-inputs
else
findInputs $i propagated propagated-build-inputs
fi
done
buildInputs = [
libxcb libpthreadstubs libXdmcp libXau pam systemd
];
for pkg in $propagated; do
addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share"
addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
done
propagatedBuildInputs = [
qtbase qtdeclarative
];
mkdir -p "$out/bin"
makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
cmakeFlags = [
"-DCONFIG_FILE=/etc/sddm.conf"
# Set UID_MIN and UID_MAX so that the build script won't try
# to read them from /etc/login.defs (fails in chroot).
# The values come from NixOS; they may not be appropriate
# for running SDDM outside NixOS, but that configuration is
# not supported anyway.
"-DUID_MIN=1000"
"-DUID_MAX=29999"
];
mkdir -p "$out/share/sddm"
for pkg in $unwrapped $themes; do
local sddmDir="$pkg/share/sddm"
if [ -d "$sddmDir" ]; then
lndir -silent "$sddmDir" "$out/share/sddm"
fi
done
runHook postInstall
preConfigure = ''
export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
'';
inherit (unwrapped) meta;
postInstall = ''
# remove empty scripts
rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
'';
meta = with lib; {
description = "QML based X11 display manager";
homepage = "https://github.com/sddm/sddm";
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ttuegel ];
};
}

View File

@ -0,0 +1,24 @@
Index: sddm-0.14.0/src/daemon/Greeter.cpp
===================================================================
--- sddm-0.14.0.orig/src/daemon/Greeter.cpp
+++ sddm-0.14.0/src/daemon/Greeter.cpp
@@ -157,18 +157,7 @@ namespace SDDM {
<< args;
// greeter environment
- QProcessEnvironment env;
- QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
-
- insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),
- QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),
- QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),
- QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),
- QStringLiteral("LD_LIBRARY_PATH"),
- QStringLiteral("QML2_IMPORT_PATH"),
- QStringLiteral("QT_PLUGIN_PATH"),
- QStringLiteral("XDG_DATA_DIRS")
- }, sysenv, env);
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
env.insert(QStringLiteral("DISPLAY"), m_display->name());

View File

@ -0,0 +1,2 @@
sddm-ignore-config-mtime.patch
sddm-nix-profiles.patch

View File

@ -15866,16 +15866,7 @@ with pkgs;
printrun = callPackage ../applications/misc/printrun { };
sddm = libsForQt5.callPackage ../applications/display-managers/sddm {
themes = []; # extra themes, etc.
};
sddmPlasma5 = sddm.override {
themes = [
plasma5.plasma-workspace
pkgs.breeze-icons
];
};
sddm = libsForQt5.callPackage ../applications/display-managers/sddm { };
skrooge = libsForQt5.callPackage ../applications/office/skrooge {};