diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 47365fad6c47..86a963bdac48 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: @@ -17,8 +17,7 @@ in mkDerivation rec { sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; }; - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ ./sddm-ignore-config-mtime.patch ]; postPatch = # Module Qt5::Test must be included in `find_package` before it is used. diff --git a/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch b/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch deleted file mode 100644 index abd10016a206..000000000000 --- a/pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6bff89542a2c1b5719370baf3c3a38fd8b2b3c37 Mon Sep 17 00:00:00 2001 -From: adisbladis -Date: Mon, 16 Oct 2017 02:25:50 +0800 -Subject: [PATCH] Disable HiDPI by default on X11 as it causes segmentation - faults with certain themes (KDE Breeze) - ---- - src/common/Configuration.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/Configuration.h b/src/common/Configuration.h -index 19c6fb1..2bb1dc5 100644 ---- a/src/common/Configuration.h -+++ b/src/common/Configuration.h -@@ -69,7 +69,7 @@ namespace SDDM { - Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server")); - Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server")); - Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used.")); -- Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling")); -+ Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling")); - ); - - Section(Wayland, --- -2.14.2 - diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series deleted file mode 100644 index 09992b211c55..000000000000 --- a/pkgs/applications/display-managers/sddm/series +++ /dev/null @@ -1,2 +0,0 @@ -sddm-ignore-config-mtime.patch -disable-hidpi-xorg.patch