Do not pass pkgs to virtuoso

svn path=/nixpkgs/trunk/; revision=20958
This commit is contained in:
Yury G. Kudryashov 2010-04-06 13:27:32 +00:00
parent f6c28984f2
commit 99fda7a42f
2 changed files with 4 additions and 5 deletions

View File

@ -1,7 +1,4 @@
a: { stdenv, fetchurl, libxml2, openssl, readline }:
let
inherit (a) stdenv fetchurl libxml2 openssl readline;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "virtuoso-opensource-6.1.0"; name = "virtuoso-opensource-6.1.0";

View File

@ -5634,7 +5634,9 @@ let
inherit fetchurl stdenv jdk apacheAnt unzip; 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 { vsftpd = import ../servers/ftp/vsftpd {
inherit fetchurl openssl stdenv libcap pam; inherit fetchurl openssl stdenv libcap pam;