monado: use opencv with protobuf_21 (#442919)

authored by philiptaron.tngl.sh and committed by GitHub e7c415cc 9b046a89

+11 -3
+11 -3
pkgs/by-name/mo/monado/package.nix
··· 35 libXrandr, 36 nix-update-script, 37 onnxruntime, 38 openhmd, 39 openvr, 40 orc, 41 pcre2, 42 pkg-config, 43 python3, 44 SDL2, 45 shaderc, ··· 62 serviceSupport ? true, 63 tracingSupport ? false, 64 }: 65 - 66 stdenv.mkDerivation (finalAttrs: { 67 pname = "monado"; 68 version = "25.0.0"; ··· 124 libXext 125 libXrandr 126 onnxruntime 127 - # FIXME: OpenCV support causes a segfault on start. See https://github.com/NixOS/nixpkgs/issues/439075 128 - # opencv4 129 openhmd 130 openvr 131 orc
··· 35 libXrandr, 36 nix-update-script, 37 onnxruntime, 38 + opencv4, 39 openhmd, 40 openvr, 41 orc, 42 pcre2, 43 pkg-config, 44 + protobuf_21, 45 python3, 46 SDL2, 47 shaderc, ··· 64 serviceSupport ? true, 65 tracingSupport ? false, 66 }: 67 + let 68 + # For some reason protobuf 32 causes a segfault during startup 69 + # Pin to last (known) working version 70 + # See https://github.com/NixOS/nixpkgs/issues/439075 71 + opencv4' = opencv4.override { 72 + protobuf = protobuf_21; 73 + }; 74 + in 75 stdenv.mkDerivation (finalAttrs: { 76 pname = "monado"; 77 version = "25.0.0"; ··· 133 libXext 134 libXrandr 135 onnxruntime 136 + opencv4' 137 openhmd 138 openvr 139 orc