diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-10-13 09:52:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-13 09:52:14 +0800 |
| commit | 82b8a22fa9e6bc535dda936abdb5daa8d2497d33 (patch) | |
| tree | 5c04ac887cf36fdafc2e2c4f4a56fcb415d765aa | |
| parent | linux: 4.9.55 -> 4.9.56 (diff) | |
| parent | sddm-kcm: init at 5.10.5 (diff) | |
| download | nixpkgs-82b8a22fa9e6bc535dda936abdb5daa8d2497d33.tar.gz | |
Merge pull request #30354 from peterhoeg/p/sddm-kcm
sddm-kcm: init at 5.10.5
| -rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/sddm-kcm.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a962d3054f81..2bb4b7deceff 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -137,6 +137,7 @@ let plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; powerdevil = callPackage ./powerdevil.nix {}; + sddm-kcm = callPackage ./sddm-kcm.nix {}; startkde = callPackage ./startkde {}; systemsettings = callPackage ./systemsettings.nix {}; }; diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix new file mode 100644 index 000000000000..65912083a4cf --- /dev/null +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, extra-cmake-modules, shared_mime_info, + libpthreadstubs, libXcursor, libXdmcp, + qtquickcontrols2, qtx11extras, + karchive, ki18n, kio, knewstuff +}: + +mkDerivation { + name = "sddm-kcm"; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + buildInputs = [ + libpthreadstubs libXcursor libXdmcp + qtquickcontrols2 qtx11extras + karchive ki18n kio knewstuff + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd3eef00f037..270a8db13670 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18233,7 +18233,7 @@ with pkgs; kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop plasma-integration plasma-nm plasma-pa plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil startkde + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde systemsettings; ### SCIENCE |