nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 17:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227986 from panicgh/openimageio

Browse Source 
openimageio: 2.4.6.1 -> 2.4.10.0
This commit is contained in:
Thomas Gerbet 2023-04-25 23:10:48 +02:00 committed by GitHub
commit 18eacf6dd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/openimageio/1.x.nix
View File

@ -72,6 +72,9 @@ stdenv.mkDerivation rec {
"CVE-2022-43601"
"CVE-2022-43602"
"CVE-2022-43603"
"CVE-2023-22845"
"CVE-2023-24472"
"CVE-2023-24473"
];
};
}

18
pkgs/development/libraries/openimageio/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, boost
, cmake
, giflib
@ -17,23 +16,15 @@
stdenv.mkDerivation rec {
pname = "openimageio";
version = "2.4.6.1";
version = "2.4.10.0";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "v${version}";
sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU=";
hash = "sha256-EQ9/G41AZJJ+KMIwDRZDf5V0VOx5fewmebeHlPWSPCQ=";
};
patches = [
(fetchpatch {
name = "arm-fix-signed-unsigned-simd-mismatch.patch";
url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch";
hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE=";
})
];
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [
@ -51,6 +42,9 @@ stdenv.mkDerivation rec {
opencolorio
openexr
robin-map
];
propagatedBuildInputs = [
fmt
];
@ -59,6 +53,8 @@ stdenv.mkDerivation rec {
"-DUSE_QT=OFF"
# GNUInstallDirs
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config
# Do not install a copy of fmt header files
"-DINTERNALIZE_FMT=OFF"
];
postFixup = ''

4
pkgs/top-level/all-packages.nix
View File

@ -32826,9 +32826,7 @@ with pkgs;
boost = boost175;
};
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
fmt = fmt_8;
};
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { };
openjump = callPackage ../applications/misc/openjump { };