sddm: wrap to include themes

nixos/modules/services/x11/display-managers/sddm.nix

@@ -9,6 +9,8 @@ let
   cfg = dmcfg.sddm;
   xEnv = config.systemd.services."display-manager".environment;
 
+  sddm = pkgs.sddm.override { inherit (cfg) themes; };
+
   xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
     #!/bin/sh
     ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
@@ -22,6 +24,8 @@ let
 
     [Theme]
     Current=${cfg.theme}
+    ThemeDir=${sddm}/share/sddm/themes
+    FacesDir=${sddm}/share/sddm/faces
 
     [Users]
     MaximumUid=${toString config.ids.uids.nixbld}
@@ -86,6 +90,14 @@ in
         '';
       };
 
+      themes = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          Extra packages providing themes.
+        '';
+      };
+
       autoLogin = mkOption {
         default = {};
         description = ''
@@ -146,8 +158,7 @@ in
     services.xserver.displayManager.job = {
       logsXsession = true;
 
-      #execCmd = "${pkgs.sddm}/bin/sddm";
+      execCmd = "exec ${sddm}/bin/sddm";
-      execCmd = "exec ${pkgs.sddm}/bin/sddm";
     };
 
     security.pam.services = {

pkgs/applications/display-managers/sddm/default.nix

@@ -1,11 +1,14 @@
-{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
+{ stdenv, makeQtWrapper, fetchFromGitHub
-, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:
+, cmake, pkgconfig, libxcb, libpthreadstubs, lndir
+, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
+, themes
+}:
 
 let
   version = "0.13.0";
-in
+
-stdenv.mkDerivation rec {
+  unwrapped = stdenv.mkDerivation rec {
-  name = "sddm-${version}";
+    name = "sddm-unwrapped-${version}";
 
     src = fetchFromGitHub {
       owner = "sddm";
@@ -19,9 +22,11 @@ stdenv.mkDerivation rec {
       ./0002-fix-ConfigReader-QStringList-corruption.patch
     ];
 
-  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];
+    nativeBuildInputs = [ cmake pkgconfig qttools ];
 
-  buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
+    buildInputs = [
+      libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd
+    ];
 
     cmakeFlags = [
       "-DCONFIG_FILE=/etc/sddm.conf"
@@ -38,11 +43,6 @@ stdenv.mkDerivation rec {
       export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
     '';
 
-  postInstall = ''
-    wrapQtProgram $out/bin/sddm
-    wrapQtProgram $out/bin/sddm-greeter
-  '';
-
     enableParallelBuilding = true;
 
     meta = with stdenv.lib; {
@@ -51,4 +51,30 @@ stdenv.mkDerivation rec {
       platforms = platforms.linux;
       maintainers = with maintainers; [ abbradar ];
     };
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "sddm-${version}";
+  phases = "installPhase";
+
+  nativeBuildInputs = [ lndir makeQtWrapper ];
+  buildInputs = [ unwrapped ] ++ themes;
+  inherit themes;
+  inherit unwrapped;
+
+  installPhase = ''
+    makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
+
+    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
+  '';
+
+  inherit (unwrapped) meta;
 }

pkgs/top-level/all-packages.nix

@@ -13115,7 +13115,9 @@ let
 
   printrun = callPackage ../applications/misc/printrun { };
 
-  sddm = qt5Libs.callPackage ../applications/display-managers/sddm { };
+  sddm = qt5Libs.callPackage ../applications/display-managers/sddm {
+    themes = [];  # extra themes, etc.
+  };
 
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;