pyrox.dev
Merge #291683: openjpeg: 2.5.0 -> 2.5.2
...into staging
+3
-18
pkgs/development/libraries/openjpeg/default.nix
+3
-18
pkgs/development/libraries/openjpeg/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config
1
+
{ lib, stdenv, fetchFromGitHub, 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
···
12
12
13
13
stdenv.mkDerivation rec {
14
14
pname = "openjpeg";
15
-
version = "2.5.0";
15
+
version = "2.5.2";
16
16
17
17
src = fetchFromGitHub {
18
18
owner = "uclouvain";
19
19
repo = "openjpeg";
20
20
rev = "v${version}";
21
-
sha256 = "sha256-/0o3Fl6/jx5zu854TCqMyOz/8mnEyEC9lpZ6ij/tbHc=";
21
+
hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw=";
22
22
};
23
23
24
24
outputs = [ "out" "dev" ];
25
-
26
-
patches = [
27
-
# modernise cmake files, also fixes them for multiple outputs
28
-
# https://github.com/uclouvain/openjpeg/pull/1424
29
-
(fetchpatch {
30
-
name = "uclouvain-openjpeg-pull-1424.patch";
31
-
url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.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
25
41
26
cmakeFlags = [
42
27
"-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"