diff options
| author | Bastian Köcher <git@kchr.de> | 2018-05-26 09:08:32 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-06-12 14:27:11 +0200 |
| commit | 6c46706fa6ed4c250bf9072fce92e172f115febe (patch) | |
| tree | 8b80d9f9f414ce3b3b428e5b75f01cbd247a81c2 | |
| parent | b785d4813e5d0f428b9563b3cea7cc6953fc24db (diff) | |
| download | nixlib-6c46706fa6ed4c250bf9072fce92e172f115febe.tar nixlib-6c46706fa6ed4c250bf9072fce92e172f115febe.tar.gz nixlib-6c46706fa6ed4c250bf9072fce92e172f115febe.tar.bz2 nixlib-6c46706fa6ed4c250bf9072fce92e172f115febe.tar.lz nixlib-6c46706fa6ed4c250bf9072fce92e172f115febe.tar.xz nixlib-6c46706fa6ed4c250bf9072fce92e172f115febe.tar.zst nixlib-6c46706fa6ed4c250bf9072fce92e172f115febe.zip | |
sddm: Fixes build with Qt 5.11
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/sddm/qt511.patch | 28 |
2 files changed, 33 insertions, 6 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index a41f917a7ec2..27b23bb571fc 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -16,15 +16,14 @@ in mkDerivation rec { sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq"; }; - patches = [ ./sddm-ignore-config-mtime.patch ]; + patches = [ + ./sddm-ignore-config-mtime.patch + ./qt511.patch + ]; postPatch = - # Module Qt5::Test must be included in `find_package` before it is used. - '' - sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|' - '' # Fix missing include for gettimeofday() - + '' + '' sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp ''; diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch new file mode 100644 index 000000000000..6430e60ed417 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/qt511.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 005c9ad..71b46d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,7 +93,7 @@ find_package(XCB REQUIRED) + find_package(XKB REQUIRED) + + # Qt 5 +-find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools) ++find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test) + + # find qt5 imports dir + get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index c9d935a..bb85ddd 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE) + + include_directories(../src/common) + +- + set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp) + add_executable(ConfigurationTest ${ConfigurationTest_SRCS}) + add_test(NAME Configuration COMMAND ConfigurationTest) + +-qt5_use_modules(ConfigurationTest Test) ++target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test) |