mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

opencolorio: Replace with 2.x

Browse source 
All applications besides Blender have been pinned to 1.x
This commit is contained in:
Maxwell Beck 2021-06-23 19:33:50 -05:00
parent 4d367a2783
commit de8a4f1741
No known key found for this signature in database
GPG key ID: 465DC9FAC329753A
8 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/graphics/krita/default.nix
View file

@ -3,7 +3,7 @@
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash, breeze-icons
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
, openjpeg, opencolorio, vc, poppler, curl, ilmbase
, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase
, qtmultimedia, qtx11extras, quazip
, python3Packages
}:
@ -23,7 +23,7 @@ mkDerivation rec {
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
openjpeg opencolorio poppler curl ilmbase
openjpeg opencolorio_1 poppler curl ilmbase
qtmultimedia qtx11extras quazip
python3Packages.pyqt5
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;

4
pkgs/applications/graphics/openimageio/2.x.nix
View file

@ -7,7 +7,7 @@
, libjpeg
, libpng
, libtiff
, opencolorio
, opencolorio_1
, openexr
, robin-map
, unzip
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
libjpeg
libpng
libtiff
opencolorio
opencolorio_1
openexr
robin-map
fmt

4
pkgs/applications/graphics/openimageio/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
, opencolorio, openexr, unzip
, opencolorio_1, openexr, unzip
}:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake unzip ];
buildInputs = [
boost ilmbase libjpeg libpng
libtiff opencolorio openexr
libtiff opencolorio_1 openexr
];
cmakeFlags = [

4
pkgs/applications/misc/blender/default.nix
View file

@ -1,7 +1,7 @@
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU, libGL, openal, opencolorio2, openexr, openimagedenoise, openimageio2, openjpeg, python39Packages
, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python39Packages
, openvdb, libXxf86vm, tbb, alembic
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
, jackaudioSupport ? false, libjack2
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ boost ffmpeg gettext glew ilmbase
freetype libjpeg libpng libsamplerate libsndfile libtiff
opencolorio2 openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
alembic
(opensubdiv.override { inherit cudaSupport; })
tbb

6
pkgs/applications/video/natron/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio,
poppler, imagemagick, openexr, ffmpeg_3, opencolorio_1, openimageio,
qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:
let
@ -58,7 +58,7 @@ let
sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pango librsvg librevenge libcdr opencolorio libxml2 libzip
pango librsvg librevenge libcdr opencolorio_1 libxml2 libzip
poppler imagemagick
];
preConfigure = ''
@ -74,7 +74,7 @@ let
sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libpng ffmpeg_3 openexr opencolorio openimageio boost libGL
libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL
seexpr libraw openjpeg libwebp
];
})

4
pkgs/applications/video/olive-editor/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation,
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full,
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full,
CoreFoundation }:
mkDerivation rec {
@ -23,7 +23,7 @@ mkDerivation rec {
buildInputs = [
ffmpeg-full
frei0r
opencolorio
opencolorio_1
qtmultimedia
] ++ lib.optional stdenv.isDarwin CoreFoundation;

4
pkgs/tools/graphics/appleseed/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile,
eigen, libpng, python, libGLU, qt4, openexr, openimageio,
opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper
opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper
}:
let boost_static = boost165.override {
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
boost_static guile eigen libpng python
libGLU qt4 openexr openimageio opencolorio xercesc
libGLU qt4 openexr openimageio opencolorio_1 xercesc
osl seexpr
];

5
pkgs/top-level/all-packages.nix
View file

@ -17513,11 +17513,10 @@ in
openldap = callPackage ../development/libraries/openldap { };
opencolorio1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
opencolorio2 = callPackage ../development/libraries/opencolorio {
opencolorio = callPackage ../development/libraries/opencolorio {
inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa;
};
opencolorio = opencolorio1;
opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
opendmarc = callPackage ../development/libraries/opendmarc { };