From 46888c922c4009e4ded43539f31a30beec96a11c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 10 Apr 2010 20:27:17 +0000
Subject: cyrus-sasl: ${out} escaping

sasl looked for plugins in '${out}/lib/sasl2', not /nix/store/.../lib/sasl2

svn path=/nixpkgs/trunk/; revision=21005
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index c9b87ebb7d28..3552ad323465 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,5 +1,5 @@
-args:
-with args;
+{ stdenv, fetchurl, openssl, db4, gettext} :
+
 stdenv.mkDerivation {
   name = "cyrus-sasl-2.1.23";
 
@@ -7,7 +7,9 @@ stdenv.mkDerivation {
     url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz;
     sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0";
   };
-  configureFlags="--with-openssl=${openssl} --with-plugindir=\${out}/lib/sasl2 --with-configdir=\${out}/lib/sasl2";
+  preConfigure=''
+    configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2"
+  '';
   buildInputs = [ openssl db4 gettext ];
   patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ];
 }
-- 
cgit 1.4.1