commit 78a6d62b4894089fe58c1706cda7c2b801294728 · pyrox.dev/nixpkgs

+13 -2

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

···

       9
       9
        
         cfg = dmcfg.sddm;

     

       10
       10
        
         xEnv = config.systemd.services."display-manager".environment;

     

       11
       11
        
       

     

       12
       12
       +
         sddm = pkgs.sddm.override { inherit (cfg) themes; };

     

       13
       13
       +
       

     

       12
       14
        
         xserverWrapper = pkgs.writeScript "xserver-wrapper" ''

     

       13
       15
        
           #!/bin/sh

     

       14
       16
        
           ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}

     
···

       22
       24
        
       

     

       23
       25
        
           [Theme]

     

       24
       26
        
           Current=${cfg.theme}

     

       27
       27
       +
           ThemeDir=${sddm}/share/sddm/themes

     

       28
       28
       +
           FacesDir=${sddm}/share/sddm/faces

     

       25
       29
        
       

     

       26
       30
        
           [Users]

     

       27
       31
        
           MaximumUid=${toString config.ids.uids.nixbld}

     
···

       86
       90
        
               '';

     

       87
       91
        
             };

     

       88
       92
        
       

     

       93
       93
       +
             themes = mkOption {

     

       94
       94
       +
               type = types.listOf types.package;

     

       95
       95
       +
               default = [];

     

       96
       96
       +
               description = ''

     

       97
       97
       +
                 Extra packages providing themes.

     

       98
       98
       +
               '';

     

       99
       99
       +
             };

     

       100
       100
       +
       

     

       89
       101
        
             autoLogin = mkOption {

     

       90
       102
        
               default = {};

     

       91
       103
        
               description = ''

     
···

       146
       158
        
           services.xserver.displayManager.job = {

     

       147
       159
        
             logsXsession = true;

     

       148
       160
        
       

     

       149
       149
       -
             #execCmd = "${pkgs.sddm}/bin/sddm";

     

       150
       150
       -
             execCmd = "exec ${pkgs.sddm}/bin/sddm";

     

       161
       161
       +
             execCmd = "exec ${sddm}/bin/sddm";

     

       151
       162
        
           };

     

       152
       163
        
       

     

       153
       164
        
           security.pam.services = {

+66 -40

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

···

       1
       1
       -
       { stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs

     

       2
       2
       -
       , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:

     

       1
       1
       +
       { stdenv, makeQtWrapper, fetchFromGitHub

     

       2
       2
       +
       , cmake, pkgconfig, libxcb, libpthreadstubs, lndir

     

       3
       3
       +
       , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd

     

       4
       4
       +
       , themes

     

       5
       5
       +
       }:

     

       3
       6
        
       

     

       4
       7
        
       let

     

       5
       8
        
         version = "0.13.0";

     

       6
       6
       -
       in

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "sddm-${version}";

     

       9
       9
        
       

     

       10
       10
       -
         src = fetchFromGitHub {

     

       11
       11
       -
           owner = "sddm";

     

       12
       12
       -
           repo = "sddm";

     

       13
       13
       -
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";

     

       15
       15
       -
         };

     

       10
       10
       +
         unwrapped = stdenv.mkDerivation rec {

     

       11
       11
       +
           name = "sddm-unwrapped-${version}";

     

       16
       12
        
       

     

       17
       17
       -
         patches = [

     

       18
       18
       -
           ./0001-ignore-config-mtime.patch

     

       19
       19
       -
           ./0002-fix-ConfigReader-QStringList-corruption.patch

     

       20
       20
       -
         ];

     

       13
       13
       +
           src = fetchFromGitHub {

     

       14
       14
       +
             owner = "sddm";

     

       15
       15
       +
             repo = "sddm";

     

       16
       16
       +
             rev = "v${version}";

     

       17
       17
       +
             sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";

     

       18
       18
       +
           };

     

       21
       19
        
       

     

       22
       22
       -
         nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];

     

       20
       20
       +
           patches = [

     

       21
       21
       +
             ./0001-ignore-config-mtime.patch

     

       22
       22
       +
             ./0002-fix-ConfigReader-QStringList-corruption.patch

     

       23
       23
       +
           ];

     

       23
       24
        
       

     

       24
       24
       -
         buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];

     

       25
       25
       +
           nativeBuildInputs = [ cmake pkgconfig qttools ];

     

       25
       26
        
       

     

       26
       26
       -
         cmakeFlags = [

     

       27
       27
       -
           "-DCONFIG_FILE=/etc/sddm.conf"

     

       28
       28
       -
           # Set UID_MIN and UID_MAX so that the build script won't try

     

       29
       29
       -
           # to read them from /etc/login.defs (fails in chroot).

     

       30
       30
       -
           # The values come from NixOS; they may not be appropriate

     

       31
       31
       -
           # for running SDDM outside NixOS, but that configuration is

     

       32
       32
       -
           # not supported anyway.

     

       33
       33
       -
           "-DUID_MIN=1000"

     

       34
       34
       -
           "-DUID_MAX=29999"

     

       35
       35
       -
         ];

     

       27
       27
       +
           buildInputs = [

     

       28
       28
       +
             libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd

     

       29
       29
       +
           ];

     

       36
       30
        
       

     

       37
       37
       -
         preConfigure = ''

     

       38
       38
       -
           export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"

     

       39
       39
       -
         '';

     

       31
       31
       +
           cmakeFlags = [

     

       32
       32
       +
             "-DCONFIG_FILE=/etc/sddm.conf"

     

       33
       33
       +
             # Set UID_MIN and UID_MAX so that the build script won't try

     

       34
       34
       +
             # to read them from /etc/login.defs (fails in chroot).

     

       35
       35
       +
             # The values come from NixOS; they may not be appropriate

     

       36
       36
       +
             # for running SDDM outside NixOS, but that configuration is

     

       37
       37
       +
             # not supported anyway.

     

       38
       38
       +
             "-DUID_MIN=1000"

     

       39
       39
       +
             "-DUID_MAX=29999"

     

       40
       40
       +
           ];

     

       40
       41
        
       

     

       41
       41
       -
         postInstall = ''

     

       42
       42
       -
           wrapQtProgram $out/bin/sddm

     

       43
       43
       -
           wrapQtProgram $out/bin/sddm-greeter

     

       44
       44
       -
         '';

     

       42
       42
       +
           preConfigure = ''

     

       43
       43
       +
             export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"

     

       44
       44
       +
           '';

     

       45
       45
        
       

     

       46
       46
       -
         enableParallelBuilding = true;

     

       46
       46
       +
           enableParallelBuilding = true;

     

       47
       47
        
       

     

       48
       48
       -
         meta = with stdenv.lib; {

     

       49
       49
       -
           description = "QML based X11 display manager";

     

       50
       50
       -
           homepage = https://github.com/sddm/sddm;

     

       51
       51
       -
           platforms = platforms.linux;

     

       52
       52
       -
           maintainers = with maintainers; [ abbradar ];

     

       48
       48
       +
           meta = with stdenv.lib; {

     

       49
       49
       +
             description = "QML based X11 display manager";

     

       50
       50
       +
             homepage = https://github.com/sddm/sddm;

     

       51
       51
       +
             platforms = platforms.linux;

     

       52
       52
       +
             maintainers = with maintainers; [ abbradar ];

     

       53
       53
       +
           };

     

       53
       54
        
         };

     

       55
       55
       +
       

     

       56
       56
       +
       in

     

       57
       57
       +
       

     

       58
       58
       +
       stdenv.mkDerivation {

     

       59
       59
       +
         name = "sddm-${version}";

     

       60
       60
       +
         phases = "installPhase";

     

       61
       61
       +
       

     

       62
       62
       +
         nativeBuildInputs = [ lndir makeQtWrapper ];

     

       63
       63
       +
         buildInputs = [ unwrapped ] ++ themes;

     

       64
       64
       +
         inherit themes;

     

       65
       65
       +
         inherit unwrapped;

     

       66
       66
       +
       

     

       67
       67
       +
         installPhase = ''

     

       68
       68
       +
           makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"

     

       69
       69
       +
       

     

       70
       70
       +
           mkdir -p "$out/share/sddm"

     

       71
       71
       +
           for pkg in $unwrapped $themes; do

     

       72
       72
       +
               local sddmDir="$pkg/share/sddm"

     

       73
       73
       +
               if [[ -d "$sddmDir" ]]; then

     

       74
       74
       +
                   lndir -silent "$sddmDir" "$out/share/sddm"

     

       75
       75
       +
               fi

     

       76
       76
       +
           done

     

       77
       77
       +
         '';

     

       78
       78
       +
       

     

       79
       79
       +
         inherit (unwrapped) meta;

     

       54
       80
        
       }

+3 -1

pkgs/top-level/all-packages.nix

···

       13115
       13115
        
       

     

       13116
       13116
        
         printrun = callPackage ../applications/misc/printrun { };

     

       13117
       13117
        
       

     

       13118
       13118
       -
         sddm = qt5Libs.callPackage ../applications/display-managers/sddm { };

     

       13118
       13118
       +
         sddm = qt5Libs.callPackage ../applications/display-managers/sddm {

     

       13119
       13119
       +
           themes = [];  # extra themes, etc.

     

       13120
       13120
       +
         };

     

       13119
       13121
        
       

     

       13120
       13122
        
         slim = callPackage ../applications/display-managers/slim {

     

       13121
       13123
        
           libpng = libpng12;