diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:38:42 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:09:49 -0500 |
| commit | 60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14 (patch) | |
| tree | 381a128e21ba9acdd295e0777db3791fb5448c3a /pkgs/applications | |
| parent | 50f76e06257831db6f76e8dbd78e77641939adfa (diff) | |
| download | nixlib-60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14.tar nixlib-60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14.tar.gz nixlib-60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14.tar.bz2 nixlib-60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14.tar.lz nixlib-60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14.tar.xz nixlib-60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14.tar.zst nixlib-60fc0af74ad9e4c241f27ef41e5e1a4e45c57e14.zip | |
sddm: build with Qt 5.5
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
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; |