From bec9f4b0c37fa187d7e14723811a51e2c212b97a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Mar 2009 16:27:32 +0000
Subject: * JasPer: build without OpenGL/X support - it's only used to build a 
  trivial example program (a barebones image viewer), but it gives   everybody
 else a dependency on Mesa ;-)

svn path=/nixpkgs/trunk/; revision=14633
---
 pkgs/development/libraries/jasper/default.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'pkgs/development/libraries/jasper')

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 192e22add6ef5..cf91952534c46 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,18 +1,19 @@
-args: with args;
+{stdenv, fetchurl, unzip, xlibs, libjpeg}:
+
 stdenv.mkDerivation rec {
-	name = "jasper-1.900.1";
+  name = "jasper-1.900.1";
 
-	src = fetchurl {
-		url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip";
-		sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
-	};
+  src = fetchurl {
+    url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip";
+    sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
+  };
 
-	buildInputs = [ unzip libjpeg xproto libX11 libICE freeglut mesa libXmu
-		libXi libXext libXt ];
-	configureFlags = "--enable-shared --disable-static --with-x";
+  buildInputs = [unzip libjpeg];
+  
+  configureFlags = "--enable-shared --disable-static";
 
-	meta = {
-		homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
-		description = "JasPer JPEG2000 Library";
-	};
+  meta = {
+    homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
+    description = "JasPer JPEG2000 Library";
+  };
 }
-- 
cgit 1.4.1