pyrox.dev
libloot: fix custom yaml-cpp build
+8
-12
pkgs/by-name/li/libloot/package.nix
+8
-12
pkgs/by-name/li/libloot/package.nix
···
19
19
icu,
20
20
spdlog,
21
21
tbb_2022,
22
-
yaml-cpp,
23
22
}:
24
23
25
24
stdenv.mkDerivation (finalAttrs: {
···
72
71
(spdlog.override { fmt = fmt_11; })
73
72
tbb_2022
74
73
75
-
finalAttrs.passthru.yaml-cpp # has merge-key support
76
74
finalAttrs.passthru.libloadorder
77
75
finalAttrs.passthru.esplugin
78
76
finalAttrs.passthru.loot-condition-interpreter
···
83
81
(lib.cmakeFeature "LIBLOADORDER_LIBRARIES" "loadorder_ffi")
84
82
(lib.cmakeFeature "LCI_LIBRARIES" "loot_condition_interpreter_ffi")
85
83
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TESTING-PLUGINS" "../testing-plugins")
84
+
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${finalAttrs.passthru.yaml-cpp-src}")
86
85
(lib.cmakeBool "LIBLOOT_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
87
86
(lib.cmakeBool "LIBLOOT_INSTALL_DOCS" withDocs)
88
87
];
···
114
113
repo = "testing-plugins";
115
114
tag = "1.6.2";
116
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=";
117
123
};
118
124
119
125
buildRustFFIPackage =
···
184
190
185
191
lang = "c";
186
192
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
193
};
198
194
};
199
195