diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 63f387db9046..701e75ff5f2b 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,21 +9,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.4"; + version = "1.9.7"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - hash = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; + hash = "sha256-YmN02OvCllxADAIicWKaTevrbAsP/ZbnhBd/hjqqz7A="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_TESTING=${if finalAttrs.finalPackage.doInstallCheck then "ON" else "OFF"}" - "-DBUILD_EXAMPLES=OFF" + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doInstallCheck) + (lib.cmakeBool "BUILD_EXAMPLES" false) ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/development/libraries/drogon/fix_find_package.patch index b76dbfe48830..49754b9fa220 100644 --- a/pkgs/development/libraries/drogon/fix_find_package.patch +++ b/pkgs/development/libraries/drogon/fix_find_package.patch @@ -1,13 +1,13 @@ -diff --git a/test.sh b/test.sh -index f017b9a..027031e 100755 ---- a/test.sh -+++ b/test.sh -@@ -135,7 +135,7 @@ if [ $os = "windows" ]; then - conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths - cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" - fi --cmake .. $cmake_gen -+cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor +diff --git i/test.sh w/test.sh +index 4796ff11..a6627fec 100755 +--- i/test.sh ++++ w/test.sh +@@ -148,7 +148,7 @@ function do_drogon_ctl_test() + -DCMAKE_POLICY_DEFAULT_CMP0091=NEW \ + -DCMAKE_CXX_STANDARD=17" + fi +- cmake .. $cmake_gen ++ cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor - if [ $? -ne 0 ]; then - echo "Failed to run CMake for example project" + if [ $? -ne 0 ]; then + echo "Failed to run CMake for example project"