diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-14 03:43:22 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-14 03:43:22 +0200 |
| commit | bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef (patch) | |
| tree | fa02a39b1a083cc39147f189d4828de16234a8b5 | |
| parent | 86872d31b1f8379c4d62aacfa18bd5a9d7530447 (diff) | |
| download | nixpkgs-bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef.tar nixpkgs-bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef.tar.gz nixpkgs-bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef.tar.bz2 nixpkgs-bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef.tar.lz nixpkgs-bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef.tar.xz nixpkgs-bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef.tar.zst nixpkgs-bdf18e72328f5a1a7d1d3dc048179bcf071cb9ef.zip | |
openjpeg: drop broken supports
| -rw-r--r-- | pkgs/development/libraries/openjpeg/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 8dd2415433a..5d2ad71bada 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -2,8 +2,6 @@ , libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server -, opjViewerSupport ? false, wxGTK # OPJViewer executable -, openjpegJarSupport ? false # Openjpeg jar (Java) , jdk , poppler }: @@ -45,8 +43,8 @@ stdenv.mkDerivation rec { "-DBUILD_THIRDPARTY=OFF" (mkFlag jpipLibSupport "BUILD_JPIP") (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") - (mkFlag opjViewerSupport "BUILD_VIEWER") - (mkFlag openjpegJarSupport "BUILD_JAVA") + "-DBUILD_VIEWER=OFF" + "-DBUILD_JAVA=OFF" (mkFlag doCheck "BUILD_TESTING") ]; @@ -54,8 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdeflate libpng libtiff zlib lcms2 ] ++ lib.optionals jpipServerSupport [ curl fcgi ] - ++ lib.optional opjViewerSupport wxGTK - ++ lib.optional (openjpegJarSupport || jpipLibSupport) jdk; + ++ lib.optional (jpipLibSupport) jdk; doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 @@ -78,7 +75,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; - # opj viewer fails to compile with lots of errors, jar requires openjpeg library already compiled and installed - broken = (opjViewerSupport || openjpegJarSupport); }; } |