openjpeg: fix eval (#356116)
This commit is contained in:
@@ -17,29 +17,26 @@
|
||||
, vips
|
||||
}:
|
||||
|
||||
let
|
||||
# may need to get updated with package
|
||||
# https://github.com/uclouvain/openjpeg-data
|
||||
test-data = fetchFromGitHub {
|
||||
owner = "uclouvain";
|
||||
repo = "openjpeg-data";
|
||||
rev = "a428429db695fccfc6d698bd13b6937dffd9d005";
|
||||
hash = "sha256-udUi7sPNQJ5uCIAM8SqMGee6vRj1QbF9pLjdpNTQE5k=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openjpeg";
|
||||
version = "2.5.2";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "uclouvain";
|
||||
repo = "openjpeg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw=";
|
||||
})
|
||||
# data for tests. may need to get updated with package
|
||||
# https://github.com/uclouvain/openjpeg-data
|
||||
(fetchFromGitHub {
|
||||
name = "data";
|
||||
owner = "uclouvain";
|
||||
repo = "openjpeg-data";
|
||||
rev = "a428429db695fccfc6d698bd13b6937dffd9d005";
|
||||
hash = "sha256-udUi7sPNQJ5uCIAM8SqMGee6vRj1QbF9pLjdpNTQE5k=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "source";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uclouvain";
|
||||
repo = "openjpeg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -51,9 +48,8 @@ stdenv.mkDerivation rec {
|
||||
(lib.cmakeBool "BUILD_JPIP_SERVER" jpipServerSupport)
|
||||
"-DBUILD_VIEWER=OFF"
|
||||
"-DBUILD_JAVA=OFF"
|
||||
"-DOPJ_DATA_ROOT=../../data"
|
||||
(lib.cmakeBool "BUILD_TESTING" doCheck)
|
||||
];
|
||||
] ++ lib.optional doCheck "-DOPJ_DATA_ROOT=${test-data}";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@@ -61,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals jpipServerSupport [ curl fcgi ]
|
||||
++ lib.optional (jpipLibSupport) jdk;
|
||||
|
||||
# tests fail on aarch64-linux and powerpc64
|
||||
# tests did fail on powerpc64
|
||||
doCheck = !stdenv.hostPlatform.isPower64
|
||||
&& stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user