diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-06 22:15:47 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-10-06 22:15:47 -0500 |
commit | 87971728b65ea3af87510703f89f56f4e9131ceb (patch) | |
tree | e413653f7cfd64a93eb661a71d95081ff67891f6 /pkgs/applications/display-managers/sddm | |
parent | 1c6caa802e52983b6ab6fef299ff58918ac9ca21 (diff) | |
download | nixlib-87971728b65ea3af87510703f89f56f4e9131ceb.tar nixlib-87971728b65ea3af87510703f89f56f4e9131ceb.tar.gz nixlib-87971728b65ea3af87510703f89f56f4e9131ceb.tar.bz2 nixlib-87971728b65ea3af87510703f89f56f4e9131ceb.tar.lz nixlib-87971728b65ea3af87510703f89f56f4e9131ceb.tar.xz nixlib-87971728b65ea3af87510703f89f56f4e9131ceb.tar.zst nixlib-87971728b65ea3af87510703f89f56f4e9131ceb.zip |
Revert "sddm: build with Qt 5.5"
This reverts commit 60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14. Fixes #10211. sddm fails at runtime when built with Qt 5.5. There is a newer version of sddm which may work with Qt 5.5.
Diffstat (limited to 'pkgs/applications/display-managers/sddm')
-rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 82cd8bd3091e..ad2c885e4966 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; |