diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-05-30 04:44:30 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-05-30 04:44:30 +0200 |
commit | fefd28f064539098058c6d56c0be918d193aa42e (patch) | |
tree | 06c66143300a4c639d275bd1fe079dae5536ed41 /pkgs/applications/graphics | |
parent | 488d23fa9cbd267a9e5d89f3118a65579c1c8bc1 (diff) | |
download | nixlib-fefd28f064539098058c6d56c0be918d193aa42e.tar nixlib-fefd28f064539098058c6d56c0be918d193aa42e.tar.gz nixlib-fefd28f064539098058c6d56c0be918d193aa42e.tar.bz2 nixlib-fefd28f064539098058c6d56c0be918d193aa42e.tar.lz nixlib-fefd28f064539098058c6d56c0be918d193aa42e.tar.xz nixlib-fefd28f064539098058c6d56c0be918d193aa42e.tar.zst nixlib-fefd28f064539098058c6d56c0be918d193aa42e.zip |
openimageio: synchronize expression with openimageio2
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/openimageio/default.nix | 25 |
1 files changed, 11 insertions, 14 deletions
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; |