pyrox.dev
lol
Merge pull request #192644 from SuperSandro2000/openjpeg-poppler
+18
-1
+18
-1
pkgs/development/libraries/openjpeg/default.nix
+18
-1
pkgs/development/libraries/openjpeg/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config
2
2
, libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer
3
3
, jpipLibSupport ? false # JPIP library & executables
4
4
, jpipServerSupport ? false, curl, fcgi # JPIP Server
5
5
, opjViewerSupport ? false, wxGTK # OPJViewer executable
6
6
, openjpegJarSupport ? false # Openjpeg jar (Java)
7
7
, jdk
8
+
, poppler
8
9
}:
9
10
10
11
let
···
24
25
25
26
outputs = [ "out" "dev" ];
26
27
28
+
patches = [
29
+
# modernise cmake files, also fixes them for multiple outputs
30
+
(fetchpatch {
31
+
url = "https://github.com/uclouvain/openjpeg/pull/1424.patch";
32
+
sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg=";
33
+
})
34
+
# fix cmake files cross compilation
35
+
(fetchpatch {
36
+
url = "https://github.com/uclouvain/openjpeg/commit/c6ceb84c221b5094f1e8a4c0c247dee3fb5074e8.patch";
37
+
sha256 = "sha256-gBUtmO/7RwSWEl7rc8HGr8gNtvNFdhjEwm0Dd51p5O8=";
38
+
})
39
+
];
40
+
27
41
cmakeFlags = [
28
42
"-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"
29
43
"-DBUILD_SHARED_LIBS=ON"
···
53
67
54
68
passthru = {
55
69
incDir = "openjpeg-${lib.versions.majorMinor version}";
70
+
tests = {
71
+
inherit poppler;
72
+
};
56
73
};
57
74
58
75
meta = with lib; {