opencolorio: Replace with 2.x
All applications besides Blender have been pinned to 1.x
This commit is contained in:
parent
4d367a2783
commit
de8a4f1741
|
@ -3,7 +3,7 @@
|
||||||
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
|
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
|
||||||
, kio, kcrash, breeze-icons
|
, kio, kcrash, breeze-icons
|
||||||
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
|
, 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
|
, qtmultimedia, qtx11extras, quazip
|
||||||
, python3Packages
|
, python3Packages
|
||||||
}:
|
}:
|
||||||
|
@ -23,7 +23,7 @@ mkDerivation rec {
|
||||||
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
||||||
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
|
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
|
||||||
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
|
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
|
||||||
openjpeg opencolorio poppler curl ilmbase
|
openjpeg opencolorio_1 poppler curl ilmbase
|
||||||
qtmultimedia qtx11extras quazip
|
qtmultimedia qtx11extras quazip
|
||||||
python3Packages.pyqt5
|
python3Packages.pyqt5
|
||||||
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
|
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
, libjpeg
|
, libjpeg
|
||||||
, libpng
|
, libpng
|
||||||
, libtiff
|
, libtiff
|
||||||
, opencolorio
|
, opencolorio_1
|
||||||
, openexr
|
, openexr
|
||||||
, robin-map
|
, robin-map
|
||||||
, unzip
|
, unzip
|
||||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
libjpeg
|
libjpeg
|
||||||
libpng
|
libpng
|
||||||
libtiff
|
libtiff
|
||||||
opencolorio
|
opencolorio_1
|
||||||
openexr
|
openexr
|
||||||
robin-map
|
robin-map
|
||||||
fmt
|
fmt
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
|
{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
|
||||||
, opencolorio, openexr, unzip
|
, opencolorio_1, openexr, unzip
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake unzip ];
|
nativeBuildInputs = [ cmake unzip ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost ilmbase libjpeg libpng
|
boost ilmbase libjpeg libpng
|
||||||
libtiff opencolorio openexr
|
libtiff opencolorio_1 openexr
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew
|
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew
|
||||||
, ilmbase, libXi, libX11, libXext, libXrender
|
, ilmbase, libXi, libX11, libXext, libXrender
|
||||||
, libjpeg, libpng, libsamplerate, libsndfile
|
, 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
|
, openvdb, libXxf86vm, tbb, alembic
|
||||||
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
|
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
|
||||||
, jackaudioSupport ? false, libjack2
|
, jackaudioSupport ? false, libjack2
|
||||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ boost ffmpeg gettext glew ilmbase
|
[ boost ffmpeg gettext glew ilmbase
|
||||||
freetype libjpeg libpng libsamplerate libsndfile libtiff
|
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
|
alembic
|
||||||
(opensubdiv.override { inherit cudaSupport; })
|
(opensubdiv.override { inherit cudaSupport; })
|
||||||
tbb
|
tbb
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
|
{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages,
|
||||||
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
|
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 }:
|
qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -58,7 +58,7 @@ let
|
||||||
sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c=";
|
sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c=";
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pango librsvg librevenge libcdr opencolorio libxml2 libzip
|
pango librsvg librevenge libcdr opencolorio_1 libxml2 libzip
|
||||||
poppler imagemagick
|
poppler imagemagick
|
||||||
];
|
];
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
@ -74,7 +74,7 @@ let
|
||||||
sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
|
sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA=";
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libpng ffmpeg_3 openexr opencolorio openimageio boost libGL
|
libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL
|
||||||
seexpr libraw openjpeg libwebp
|
seexpr libraw openjpeg libwebp
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation,
|
{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation,
|
||||||
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full,
|
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full,
|
||||||
CoreFoundation }:
|
CoreFoundation }:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
|
@ -23,7 +23,7 @@ mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
frei0r
|
frei0r
|
||||||
opencolorio
|
opencolorio_1
|
||||||
qtmultimedia
|
qtmultimedia
|
||||||
] ++ lib.optional stdenv.isDarwin CoreFoundation;
|
] ++ lib.optional stdenv.isDarwin CoreFoundation;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile,
|
{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile,
|
||||||
eigen, libpng, python, libGLU, qt4, openexr, openimageio,
|
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 {
|
let boost_static = boost165.override {
|
||||||
|
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost_static guile eigen libpng python
|
boost_static guile eigen libpng python
|
||||||
libGLU qt4 openexr openimageio opencolorio xercesc
|
libGLU qt4 openexr openimageio opencolorio_1 xercesc
|
||||||
osl seexpr
|
osl seexpr
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -17513,11 +17513,10 @@ in
|
||||||
|
|
||||||
openldap = callPackage ../development/libraries/openldap { };
|
openldap = callPackage ../development/libraries/openldap { };
|
||||||
|
|
||||||
opencolorio1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
|
opencolorio = callPackage ../development/libraries/opencolorio {
|
||||||
opencolorio2 = callPackage ../development/libraries/opencolorio {
|
|
||||||
inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa;
|
inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa;
|
||||||
};
|
};
|
||||||
opencolorio = opencolorio1;
|
opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
|
||||||
|
|
||||||
opendmarc = callPackage ../development/libraries/opendmarc { };
|
opendmarc = callPackage ../development/libraries/opendmarc { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue