pyrox.dev
Merge pull request #261258 from yu-re-ka/kemai
kemai: wayland support, set mainProgram, update
-38
pkgs/applications/misc/kemai/000-cmake-disable-conan.diff
-38
pkgs/applications/misc/kemai/000-cmake-disable-conan.diff
···
1
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
-
index ce78a9d..3cd51e0 100644
3
-
--- a/CMakeLists.txt
4
-
+++ b/CMakeLists.txt
5
-
@@ -8,18 +8,21 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
6
-
# Common configuration
7
-
set(CMAKE_CXX_STANDARD 20)
8
-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
9
-
-
10
-
-# Setup Conan
11
-
-if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
12
-
- message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
13
-
- file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake"
14
-
- "${CMAKE_BINARY_DIR}/conan.cmake"
15
-
- TLS_VERIFY ON)
16
-
-endif()
17
-
-include(${CMAKE_BINARY_DIR}/conan.cmake)
18
-
-
19
-
-conan_cmake_autodetect(settings)
20
-
-conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings})
21
-
+set(USE_CONAN ON CACHE BOOL "Use conan for dependency managment")
22
-
+
23
-
+if(USE_CONAN)
24
-
+ # Setup Conan
25
-
+ if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
26
-
+ message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
27
-
+ file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake"
28
-
+ "${CMAKE_BINARY_DIR}/conan.cmake"
29
-
+ TLS_VERIFY ON)
30
-
+ endif()
31
-
+ include(${CMAKE_BINARY_DIR}/conan.cmake)
32
-
+
33
-
+ conan_cmake_autodetect(settings)
34
-
+ conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings})
35
-
+endif ()
36
-
37
-
# Setup Qt
38
-
set(CMAKE_AUTOMOC ON)
+22
-4
pkgs/applications/misc/kemai/default.nix
+22
-4
pkgs/applications/misc/kemai/default.nix
···
1
1
{ lib
2
2
, stdenv
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, cmake
5
6
, magic-enum
7
+
, range-v3
6
8
, spdlog
7
9
, qtbase
8
10
, qtconnectivity
9
11
, qttools
10
12
, qtlanguageserver
13
+
, qtwayland
11
14
, wrapQtAppsHook
12
15
, libXScrnSaver
13
16
, nix-update-script
···
15
18
16
19
stdenv.mkDerivation rec {
17
20
pname = "kemai";
18
-
version = "0.9.2";
21
+
version = "0.10.0";
19
22
20
23
src = fetchFromGitHub {
21
24
owner = "AlexandrePTJ";
22
25
repo = "kemai";
23
26
rev = version;
24
-
hash = "sha256-PDjNO2iMPK0J3TSHVZ/DW3W0GkdB8yNZYoTGEd2snac=";
27
+
hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM=";
25
28
};
26
29
30
+
patches = [
31
+
# Backport the fix for an issue where LICENSE.txt ends up in /bin
32
+
# Remove in next release
33
+
(fetchpatch {
34
+
url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch";
35
+
hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg=";
36
+
})
37
+
];
38
+
27
39
buildInputs = [
28
40
qtbase
29
41
qtconnectivity
···
31
43
qtlanguageserver
32
44
libXScrnSaver
33
45
magic-enum
46
+
range-v3
34
47
spdlog
48
+
] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
49
+
cmakeFlags = [
50
+
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
51
+
"-DFETCHCONTENT_QUIET=OFF"
52
+
"-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
35
53
];
36
-
cmakeFlags = [ "-DUSE_CONAN=OFF" ];
37
-
patches = [ ./000-cmake-disable-conan.diff ];
38
54
39
55
nativeBuildInputs = [ cmake wrapQtAppsHook ];
40
56
···
48
64
license = licenses.mit;
49
65
maintainers = with maintainers; [ poelzi ];
50
66
platforms = platforms.unix;
67
+
broken = stdenv.isDarwin;
68
+
mainProgram = "Kemai";
51
69
};
52
70
}