* More cleanup.

svn path=/nixpkgs/trunk/; revision=22798

1 files changed, 12 insertions, 10 deletions

diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index de4672ceb5e..386b92f2684 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,16 +1,18 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }:
 
-stdenv.mkDerivation {
-  inherit version;
-  name = "openexr-${version}";
+stdenv.mkDerivation rec {
+  name = "openexr-1.6.1";
+  
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/openexr/openexr-${version}.tar.gz";
-    sha256 = if (version == "1.6.1") then "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6"
-             else if (version == "1.4.0") then "1y3dxakpg9651dgbj2xp6r4044b5gi74g23w3sr5cs6xi7cywv7m"
-               else abort "not supported version";
+    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6";
   };
-  buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
-  propagatedBuildInputs = [pkgconfig zlib ilmbase];
+  
+  buildInputs = [ pkgconfig ctl ];
+  
+  propagatedBuildInputs = [ zlib ilmbase ];
+  
   configureFlags = "--enable-imfexamples";
+  
   patches = [ ./stringh.patch ];
 }