libloot: fix custom yaml-cpp build

TomaSajt 17d05fce 73dfe087

+8 -12
+8 -12
pkgs/by-name/li/libloot/package.nix
··· 19 icu, 20 spdlog, 21 tbb_2022, 22 - yaml-cpp, 23 }: 24 25 stdenv.mkDerivation (finalAttrs: { ··· 72 (spdlog.override { fmt = fmt_11; }) 73 tbb_2022 74 75 - finalAttrs.passthru.yaml-cpp # has merge-key support 76 finalAttrs.passthru.libloadorder 77 finalAttrs.passthru.esplugin 78 finalAttrs.passthru.loot-condition-interpreter ··· 83 (lib.cmakeFeature "LIBLOADORDER_LIBRARIES" "loadorder_ffi") 84 (lib.cmakeFeature "LCI_LIBRARIES" "loot_condition_interpreter_ffi") 85 (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TESTING-PLUGINS" "../testing-plugins") 86 (lib.cmakeBool "LIBLOOT_BUILD_TESTS" finalAttrs.finalPackage.doCheck) 87 (lib.cmakeBool "LIBLOOT_INSTALL_DOCS" withDocs) 88 ]; ··· 114 repo = "testing-plugins"; 115 tag = "1.6.2"; 116 hash = "sha256-3Aa98EwqpuGA3YlsRF8luWzXVEFO/rs6JXisXdLyIK4="; 117 }; 118 119 buildRustFFIPackage = ··· 184 185 lang = "c"; 186 header = "loot_condition_interpreter.h"; 187 - }; 188 - 189 - yaml-cpp = yaml-cpp.overrideAttrs rec { 190 - version = "0.8.0+merge-key-support.2"; 191 - src = fetchFromGitHub { 192 - owner = "loot"; 193 - repo = "yaml-cpp"; 194 - tag = version; 195 - hash = "sha256-whYorebrLiDeO75LC2SMUX/8OD528BR0+DEgnJxxpoQ="; 196 - }; 197 }; 198 }; 199
··· 19 icu, 20 spdlog, 21 tbb_2022, 22 }: 23 24 stdenv.mkDerivation (finalAttrs: { ··· 71 (spdlog.override { fmt = fmt_11; }) 72 tbb_2022 73 74 finalAttrs.passthru.libloadorder 75 finalAttrs.passthru.esplugin 76 finalAttrs.passthru.loot-condition-interpreter ··· 81 (lib.cmakeFeature "LIBLOADORDER_LIBRARIES" "loadorder_ffi") 82 (lib.cmakeFeature "LCI_LIBRARIES" "loot_condition_interpreter_ffi") 83 (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TESTING-PLUGINS" "../testing-plugins") 84 + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${finalAttrs.passthru.yaml-cpp-src}") 85 (lib.cmakeBool "LIBLOOT_BUILD_TESTS" finalAttrs.finalPackage.doCheck) 86 (lib.cmakeBool "LIBLOOT_INSTALL_DOCS" withDocs) 87 ]; ··· 113 repo = "testing-plugins"; 114 tag = "1.6.2"; 115 hash = "sha256-3Aa98EwqpuGA3YlsRF8luWzXVEFO/rs6JXisXdLyIK4="; 116 + }; 117 + 118 + yaml-cpp-src = fetchFromGitHub { 119 + owner = "loot"; 120 + repo = "yaml-cpp"; 121 + tag = "0.8.0+merge-key-support.2"; 122 + hash = "sha256-whYorebrLiDeO75LC2SMUX/8OD528BR0+DEgnJxxpoQ="; 123 }; 124 125 buildRustFFIPackage = ··· 190 191 lang = "c"; 192 header = "loot_condition_interpreter.h"; 193 }; 194 }; 195