diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index ad2c885e4966..82cd8bd3091e 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs -, libXdmcp, libXau, qt5, pam, systemd }: +{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, libxcb +, libpthreadstubs, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam +, systemd +}: let version = "0.11.0"; @@ -14,9 +16,9 @@ stdenv.mkDerivation rec { sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig"; }; - nativeBuildInputs = [ cmake pkgconfig qt5.tools makeWrapper ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; - buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qt5.base pam systemd ]; + buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ]; patches = [ (fetchpatch { url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch"; @@ -32,8 +34,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/sddm-greeter \ - --set QML2_IMPORT_PATH "${qt5.declarative}/lib/qt5/qml/" + wrapQtProgram $out/bin/sddm + wrapQtProgram $out/bin/sddm-greeter ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc1410184417..3b8835cb79aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12705,7 +12705,7 @@ let printrun = callPackage ../applications/misc/printrun { }; - sddm = callPackage ../applications/display-managers/sddm { }; + sddm = qt5Libs.callPackage ../applications/display-managers/sddm { }; slim = callPackage ../applications/display-managers/slim { libpng = libpng12;