about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorndowens <ndowens04@gmail.com>2017-03-19 12:12:40 -0500
committerGitHub <noreply@github.com>2017-03-19 12:12:40 -0500
commit26187da45cf403e3eb70807dc45d5e4402be1d48 (patch)
tree4f057ee0ea6fbd508c3b155047052dc6948f74fb /pkgs/applications/graphics
parentde494f5842544dba12a09c7f119e2cc645780cc7 (diff)
parentf5d6dd6e83a73392bb4ff4509a8a84e0bf240002 (diff)
downloadnixlib-26187da45cf403e3eb70807dc45d5e4402be1d48.tar
nixlib-26187da45cf403e3eb70807dc45d5e4402be1d48.tar.gz
nixlib-26187da45cf403e3eb70807dc45d5e4402be1d48.tar.bz2
nixlib-26187da45cf403e3eb70807dc45d5e4402be1d48.tar.lz
nixlib-26187da45cf403e3eb70807dc45d5e4402be1d48.tar.xz
nixlib-26187da45cf403e3eb70807dc45d5e4402be1d48.tar.zst
nixlib-26187da45cf403e3eb70807dc45d5e4402be1d48.zip
Merge pull request #24038 from ndowens/openimageio
openimageio: 1.6.11 -> 1.7.12
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/openimageio/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index d16800dc881d..44faeea007d6 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
+{ stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
 , opencolorio, openexr, unzip
 }:
 
 stdenv.mkDerivation rec {
   name = "openimageio-${version}";
-  version = "1.6.11";
+  version = "1.7.12";
 
-  src = fetchurl {
-    url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x";
+  src = fetchFromGitHub {
+    owner = "OpenImageIO";
+    repo = "oiio";
+    rev = "Release-${version}";
+    sha256 = "1ganx4f7zis5lkxxrwc83dbgngaxww2846bsc4vrg5dhjnns6n4y";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr
+    boost ilmbase libjpeg libpng 
+    libtiff opencolorio openexr
     unzip
   ];