From 99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 6 Apr 2010 13:27:32 +0000
Subject: [PATCH] Do not pass pkgs to virtuoso

svn path=/nixpkgs/trunk/; revision=20958
---
 pkgs/servers/sql/virtuoso/default.nix | 5 +----
 pkgs/top-level/all-packages.nix       | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix
index c533da3f1d4..6730ce26fcd 100644
--- a/pkgs/servers/sql/virtuoso/default.nix
+++ b/pkgs/servers/sql/virtuoso/default.nix
@@ -1,7 +1,4 @@
-a:
-let
-  inherit (a) stdenv fetchurl libxml2 openssl readline;
-in
+{ stdenv, fetchurl, libxml2, openssl, readline }:
 
 stdenv.mkDerivation rec {
   name = "virtuoso-opensource-6.1.0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a411eceea8..f34c4f6fc53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5634,7 +5634,9 @@ let
     inherit fetchurl stdenv jdk apacheAnt unzip;
   };
 
-  virtuoso = makeOverridable (import ../servers/sql/virtuoso) pkgs;
+  virtuoso = makeOverridable (import ../servers/sql/virtuoso) {
+    inherit stdenv fetchurl libxml2 openssl readline;
+  };
 
   vsftpd = import ../servers/ftp/vsftpd {
     inherit fetchurl openssl stdenv libcap pam;