fex: update to qt6, make qt optional

Closes #376837

andre4ik3 c1603940 fc6467f9

+15 -10
+15 -10
pkgs/by-name/fe/fex/package.nix
··· 5 5 cmake, 6 6 ninja, 7 7 pkg-config, 8 - qt5, 9 8 python3, 10 9 nix-update-script, 11 10 xxHash, 12 11 fmt, 12 + libxml2, 13 + openssl, 13 14 range-v3, 15 + catch2, 14 16 nasm, 15 17 buildEnv, 16 18 writeText, ··· 22 24 libGL, 23 25 wayland, 24 26 xorg, 27 + withQt ? true, 28 + qt6, 25 29 }: 26 30 27 31 let ··· 160 164 cmake 161 165 ninja 162 166 pkg-config 163 - qt5.wrapQtAppsHook 164 167 llvmPackages.bintools 165 168 166 169 (python3.withPackages ( ··· 169 172 libclang 170 173 ] 171 174 )) 172 - ]; 175 + ] 176 + ++ lib.optional withQt qt6.wrapQtAppsHook; 173 177 174 178 nativeCheckInputs = [ nasm ]; 175 179 176 180 buildInputs = [ 177 181 xxHash 178 182 fmt 183 + libxml2 184 + openssl 179 185 range-v3 180 186 pkgsCross64.buildPackages.clang 181 187 pkgsCross32.buildPackages.clang ··· 183 189 libllvm 184 190 ] 185 191 ++ libForwardingInputs 186 - ++ (with qt5; [ 187 - qtbase 188 - qtdeclarative 189 - qtquickcontrols 190 - qtquickcontrols2 191 - ]); 192 + ++ lib.optionals withQt [ 193 + qt6.qtbase 194 + qt6.qtdeclarative 195 + ]; 192 196 193 197 cmakeFlags = [ 194 198 (lib.cmakeFeature "USE_LINKER" "lld") ··· 197 201 (lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version) 198 202 (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) 199 203 (lib.cmakeBool "BUILD_THUNKS" true) 204 + (lib.cmakeBool "BUILD_FEXCONFIG" withQt) 200 205 (lib.cmakeFeature "X86_32_TOOLCHAIN_FILE" "${toolchain32}") 201 206 (lib.cmakeFeature "X86_64_TOOLCHAIN_FILE" "${toolchain}") 202 207 (lib.cmakeFeature "X86_DEV_ROOTFS" "${devRootFS}") ··· 219 224 # Avoid wrapping anything other than FEXConfig, since the wrapped executables 220 225 # don't seem to work when registered as binfmts. 221 226 dontWrapQtApps = true; 222 - preFixup = '' 227 + preFixup = lib.optionalString withQt '' 223 228 wrapQtApp $out/bin/FEXConfig 224 229 ''; 225 230