libyafaray: 3.5.1 -> unstable-2022-09-17

* fixes build
* enable aarch64-linux platform
This commit is contained in:
superherointj 2022-09-23 13:29:30 -03:00
parent 913b37909b
commit 8e819696fe
4 changed files with 66 additions and 41 deletions

View File

@ -0,0 +1,63 @@
{ boost165
, cmake
, fetchFromGitHub
, freetype
, ilmbase
, lib
, libjpeg
, libtiff
, libxml2
, opencv
, openexr
, pkg-config
, stdenv
, swig
, zlib
, withPython ? true, python3
}:
stdenv.mkDerivation rec {
pname = "libyafaray";
version = "unstable-2022-09-17";
src = fetchFromGitHub {
owner = "YafaRay";
repo = "libYafaRay";
rev = "6e8c45fb150185b3356220e5f99478f20408ee49";
sha256 = "sha256-UVBA1vXOuLg4RT+BdF4rhbZ6I9ySeZX0N81gh3MH84I=";
};
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR"
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
boost165
freetype
ilmbase
libjpeg
libtiff
libxml2
opencv
openexr
swig
zlib
] ++ lib.optional withPython python3;
meta = with lib; {
description = "A free, open source raytracer";
downloadPage = "https://github.com/YafaRay/libYafaRay";
homepage = "http://www.yafaray.org";
maintainers = with maintainers; [ hodapp ];
license = licenses.lgpl21;
platforms = [ "aarch64-linux" "x86_64-linux" ];
};
}
# TODO: Add optional Ruby support
# TODO: Add Qt support? (CMake looks for it, but what for?)

View File

@ -1,39 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, opencv, zlib
, libxml2, freetype, libjpeg, libtiff, swig, openexr
, ilmbase, boost165
, withPython ? true, python3
}:
stdenv.mkDerivation rec {
pname = "yafaray-core";
version = "3.5.1";
src = fetchFromGitHub {
owner = "YafaRay";
repo = "Core";
rev = "v${version}";
sha256 = "043ixf3h4ay2fahsw9lh0pha82f7ri04mlfhvn2pg251012jvhrx";
};
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR"
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
boost165 opencv zlib libxml2 freetype libjpeg libtiff
swig openexr ilmbase
] ++ lib.optional withPython python3;
meta = with lib; {
description = "A free, open source raytracer";
homepage = "http://www.yafaray.org";
maintainers = with maintainers; [ hodapp ];
license = licenses.lgpl21;
platforms = [ "x86_64-linux" ];
};
}
# TODO: Add optional Ruby support
# TODO: Add Qt support? (CMake looks for it, but what for?)

View File

@ -1559,6 +1559,7 @@ mapAliases ({
### Y ###
yacc = bison; # moved from top-level 2021-03-14
yafaray-core = libyafaray; # Added 2022-09-23
yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15
youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";

View File

@ -8714,6 +8714,8 @@ with pkgs;
libwebsockets = callPackage ../development/libraries/libwebsockets { };
libyafaray = callPackage ../tools/graphics/libyafaray { };
licensee = callPackage ../tools/package-management/licensee { };
lidarr = callPackage ../servers/lidarr { };
@ -12702,8 +12704,6 @@ with pkgs;
xwinwrap = callPackage ../tools/X11/xwinwrap {};
yafaray-core = callPackage ../tools/graphics/yafaray-core { stdenv = gcc10StdenvCompat; };
yajsv = callPackage ../tools/misc/yajsv { };
yallback = callPackage ../development/tools/analysis/yallback { };