diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-05-31 13:53:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-31 13:53:05 +0200 |
commit | 2c347116b5b2eb5810dcf1c6da5097450a524d30 (patch) | |
tree | 8b2c9339ca88b023c6aee80cb01ce0547d52fd0f /pkgs/applications/graphics | |
parent | 32ba4cf057570f27535d8fa6e3be32014cedc3e5 (diff) | |
parent | fefd28f064539098058c6d56c0be918d193aa42e (diff) | |
download | nixlib-2c347116b5b2eb5810dcf1c6da5097450a524d30.tar nixlib-2c347116b5b2eb5810dcf1c6da5097450a524d30.tar.gz nixlib-2c347116b5b2eb5810dcf1c6da5097450a524d30.tar.bz2 nixlib-2c347116b5b2eb5810dcf1c6da5097450a524d30.tar.lz nixlib-2c347116b5b2eb5810dcf1c6da5097450a524d30.tar.xz nixlib-2c347116b5b2eb5810dcf1c6da5097450a524d30.tar.zst nixlib-2c347116b5b2eb5810dcf1c6da5097450a524d30.zip |
Merge pull request #62237 from jtojnar/openimageio2
openimageio2: init at 2.0.8
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/openimageio/2.x.nix | 60 | ||||
-rw-r--r-- | pkgs/applications/graphics/openimageio/default.nix | 25 |
2 files changed, 71 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix new file mode 100644 index 000000000000..f2e8eee9940b --- /dev/null +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -0,0 +1,60 @@ +{ stdenv +, fetchFromGitHub +, boost +, cmake +, ilmbase +, libjpeg +, libpng +, libtiff +, opencolorio +, openexr +, robin-map +, unzip +}: + +stdenv.mkDerivation rec { + pname = "openimageio"; + version = "2.0.8"; + + src = fetchFromGitHub { + owner = "OpenImageIO"; + repo = "oiio"; + rev = "Release-${version}"; + sha256 = "0nk72h7q1n664b268zkhibb7a3i7fb3nl2z7fg31ys5r9zlq6mnp"; + }; + + outputs = [ "bin" "out" "dev" "doc" ]; + + nativeBuildInputs = [ + cmake + unzip + ]; + + buildInputs = [ + boost + ilmbase + libjpeg + libpng + libtiff + opencolorio + openexr + robin-map + ]; + + cmakeFlags = [ + "-DUSE_PYTHON=OFF" + "-DUSE_QT=OFF" + # GNUInstallDirs + "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = http://www.openimageio.org; + description = "A library and tools for reading and writing images"; + license = licenses.bsd3; + maintainers = with maintainers; [ goibhniu jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index f405ca01200d..a3fc0ea46f43 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "openimageio-${version}"; + pname = "openimageio"; version = "1.8.16"; src = fetchFromGitHub { @@ -15,28 +15,25 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake unzip ]; buildInputs = [ boost ilmbase libjpeg libpng libtiff opencolorio openexr - unzip ]; cmakeFlags = [ "-DUSE_PYTHON=OFF" + # GNUInstallDirs + "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" ]; - preBuild = '' - makeFlags="ILMBASE_HOME=${ilmbase.dev} OPENEXR_HOME=${openexr.dev} USE_PYTHON=0 - INSTALLDIR=$out dist_dir=" - ''; - - postInstall = '' - mkdir -p $bin - mv $out/bin $bin/ - ''; - - enableParallelBuilding = true; + makeFlags = [ + "ILMBASE_HOME=${ilmbase.dev}" + "OPENEXR_HOME=${openexr.dev}" + "USE_PYTHON=0" + "INSTALLDIR=${placeholder "out"}" + "dist_dir=" + ]; meta = with stdenv.lib; { homepage = http://www.openimageio.org; |