colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "sddm: build with Qt 5.5"

Browse Source 
This reverts commit 60fc0af74a.

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.
This commit is contained in:
Thomas Tuegel 2015-10-06 22:15:47 -05:00
parent 1c6caa802e
commit 87971728b6
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/display-managers/sddm/default.nix
View File

@ -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;

2
pkgs/top-level/all-packages.nix
View File

@ -12729,7 +12729,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;