diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 82cd8bd3091..ad2c885e496 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,7 +1,5 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, libxcb -, libpthreadstubs, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam -, systemd -}: +{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs +, libXdmcp, libXau, qt5, pam, systemd }: let version = "0.11.0"; @@ -16,9 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig"; }; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkgconfig qt5.tools makeWrapper ]; - buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ]; + buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qt5.base pam systemd ]; patches = [ (fetchpatch { url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch"; @@ -34,8 +32,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapQtProgram $out/bin/sddm - wrapQtProgram $out/bin/sddm-greeter + wrapProgram $out/bin/sddm-greeter \ + --set QML2_IMPORT_PATH "${qt5.declarative}/lib/qt5/qml/" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index ec9873390e5..80c04a38a48 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -158,7 +158,7 @@ let breeze-qt4 = overrideDerivation super.breeze (drv: { name = "breeze-qt4-${version}"; buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; - nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.automoc4 scope.cmake pkgs.pkgconfig ]; cmakeFlags = [ "-DUSE_KDE4=ON" "-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78a4dc1d996..dd34f63ea3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12734,7 +12734,7 @@ let printrun = callPackage ../applications/misc/printrun { }; - sddm = qt5Libs.callPackage ../applications/display-managers/sddm { }; + sddm = callPackage ../applications/display-managers/sddm { }; slim = callPackage ../applications/display-managers/slim { libpng = libpng12;