mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
sddm: Fixes build with Qt 5.11
This commit is contained in:
parent
b785d4813e
commit
6c46706fa6
@ -16,15 +16,14 @@ in mkDerivation rec {
|
|||||||
sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
|
sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./sddm-ignore-config-mtime.patch ];
|
patches = [
|
||||||
|
./sddm-ignore-config-mtime.patch
|
||||||
|
./qt511.patch
|
||||||
|
];
|
||||||
|
|
||||||
postPatch =
|
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()
|
# Fix missing include for gettimeofday()
|
||||||
+ ''
|
''
|
||||||
sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp
|
sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
28
pkgs/applications/display-managers/sddm/qt511.patch
Normal file
28
pkgs/applications/display-managers/sddm/qt511.patch
Normal file
@ -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)
|
Loading…
Reference in New Issue
Block a user