Merge pull request #195886 from wegank/openjpeg-wxgtk

openjpeg: drop broken supports

authored by Robert Scott and committed by GitHub fbcad40e d7c3a973

+3 -8
+3 -8
pkgs/development/libraries/openjpeg/default.nix
··· 2 2 , libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer 3 3 , jpipLibSupport ? false # JPIP library & executables 4 4 , jpipServerSupport ? false, curl, fcgi # JPIP Server 5 - , opjViewerSupport ? false, wxGTK # OPJViewer executable 6 - , openjpegJarSupport ? false # Openjpeg jar (Java) 7 5 , jdk 8 6 , poppler 9 7 }: ··· 45 43 "-DBUILD_THIRDPARTY=OFF" 46 44 (mkFlag jpipLibSupport "BUILD_JPIP") 47 45 (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") 48 - (mkFlag opjViewerSupport "BUILD_VIEWER") 49 - (mkFlag openjpegJarSupport "BUILD_JAVA") 46 + "-DBUILD_VIEWER=OFF" 47 + "-DBUILD_JAVA=OFF" 50 48 (mkFlag doCheck "BUILD_TESTING") 51 49 ]; 52 50 ··· 54 52 55 53 buildInputs = [ libdeflate libpng libtiff zlib lcms2 ] 56 54 ++ lib.optionals jpipServerSupport [ curl fcgi ] 57 - ++ lib.optional opjViewerSupport wxGTK 58 - ++ lib.optional (openjpegJarSupport || jpipLibSupport) jdk; 55 + ++ lib.optional (jpipLibSupport) jdk; 59 56 60 57 doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 61 58 ··· 78 75 license = licenses.bsd2; 79 76 maintainers = with maintainers; [ codyopel ]; 80 77 platforms = platforms.all; 81 - # opj viewer fails to compile with lots of errors, jar requires openjpeg library already compiled and installed 82 - broken = (opjViewerSupport || openjpegJarSupport); 83 78 }; 84 79 }