Loading pkgs/applications/misc/kemai/000-cmake-disable-conan.diff 0 → 100644 +38 −0 Original line number Diff line number Diff line diff --git a/CMakeLists.txt b/CMakeLists.txt index ce78a9d..3cd51e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,18 +8,21 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}) # Common configuration set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) - -# Setup Conan -if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") - message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" - "${CMAKE_BINARY_DIR}/conan.cmake" - TLS_VERIFY ON) -endif() -include(${CMAKE_BINARY_DIR}/conan.cmake) - -conan_cmake_autodetect(settings) -conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) +set(USE_CONAN ON CACHE BOOL "Use conan for dependency managment") + +if(USE_CONAN) + # Setup Conan + if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") + message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") + file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" + "${CMAKE_BINARY_DIR}/conan.cmake" + TLS_VERIFY ON) + endif() + include(${CMAKE_BINARY_DIR}/conan.cmake) + + conan_cmake_autodetect(settings) + conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) +endif () # Setup Qt set(CMAKE_AUTOMOC ON) pkgs/applications/misc/kemai/default.nix 0 → 100644 +52 −0 Original line number Diff line number Diff line { lib , stdenv , fetchFromGitHub , cmake , magic-enum , spdlog , qtbase , qtconnectivity , qttools , qtlanguageserver , wrapQtAppsHook , libXScrnSaver , nix-update-script }: stdenv.mkDerivation rec { pname = "kemai"; version = "0.9.2"; src = fetchFromGitHub { owner = "AlexandrePTJ"; repo = "kemai"; rev = version; hash = "sha256-PDjNO2iMPK0J3TSHVZ/DW3W0GkdB8yNZYoTGEd2snac="; }; buildInputs = [ qtbase qtconnectivity qttools qtlanguageserver libXScrnSaver magic-enum spdlog ]; cmakeFlags = [ "-DUSE_CONAN=OFF" ]; patches = [ ./000-cmake-disable-conan.diff ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; passthru = { updateScript = nix-update-script { }; }; meta = with lib; { description = "Kimai desktop client written in QT6"; homepage = "https://github.com/AlexandrePTJ/kemai"; license = licenses.mit; maintainers = with maintainers; [ poelzi ]; platforms = platforms.unix; }; } pkgs/top-level/all-packages.nix +2 −0 Original line number Diff line number Diff line Loading @@ -30779,6 +30779,8 @@ with pkgs; inherit (qt6) wrapQtAppsHook qtbase qtcharts; }; kemai = qt6Packages.callPackage ../applications/misc/kemai { }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; Loading
pkgs/applications/misc/kemai/000-cmake-disable-conan.diff 0 → 100644 +38 −0 Original line number Diff line number Diff line diff --git a/CMakeLists.txt b/CMakeLists.txt index ce78a9d..3cd51e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,18 +8,21 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}) # Common configuration set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) - -# Setup Conan -if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") - message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" - "${CMAKE_BINARY_DIR}/conan.cmake" - TLS_VERIFY ON) -endif() -include(${CMAKE_BINARY_DIR}/conan.cmake) - -conan_cmake_autodetect(settings) -conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) +set(USE_CONAN ON CACHE BOOL "Use conan for dependency managment") + +if(USE_CONAN) + # Setup Conan + if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") + message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") + file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" + "${CMAKE_BINARY_DIR}/conan.cmake" + TLS_VERIFY ON) + endif() + include(${CMAKE_BINARY_DIR}/conan.cmake) + + conan_cmake_autodetect(settings) + conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} BUILD missing SETTINGS ${settings}) +endif () # Setup Qt set(CMAKE_AUTOMOC ON)
pkgs/applications/misc/kemai/default.nix 0 → 100644 +52 −0 Original line number Diff line number Diff line { lib , stdenv , fetchFromGitHub , cmake , magic-enum , spdlog , qtbase , qtconnectivity , qttools , qtlanguageserver , wrapQtAppsHook , libXScrnSaver , nix-update-script }: stdenv.mkDerivation rec { pname = "kemai"; version = "0.9.2"; src = fetchFromGitHub { owner = "AlexandrePTJ"; repo = "kemai"; rev = version; hash = "sha256-PDjNO2iMPK0J3TSHVZ/DW3W0GkdB8yNZYoTGEd2snac="; }; buildInputs = [ qtbase qtconnectivity qttools qtlanguageserver libXScrnSaver magic-enum spdlog ]; cmakeFlags = [ "-DUSE_CONAN=OFF" ]; patches = [ ./000-cmake-disable-conan.diff ]; nativeBuildInputs = [ cmake wrapQtAppsHook ]; passthru = { updateScript = nix-update-script { }; }; meta = with lib; { description = "Kimai desktop client written in QT6"; homepage = "https://github.com/AlexandrePTJ/kemai"; license = licenses.mit; maintainers = with maintainers; [ poelzi ]; platforms = platforms.unix; }; }
pkgs/top-level/all-packages.nix +2 −0 Original line number Diff line number Diff line Loading @@ -30779,6 +30779,8 @@ with pkgs; inherit (qt6) wrapQtAppsHook qtbase qtcharts; }; kemai = qt6Packages.callPackage ../applications/misc/kemai { }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk;