pyrox.dev / nixpkgs
lol
fork atom

fex: update to qt6, make qt optional

Closes #376837

andre4ik3 c1603940 fc6467f9

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