diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-06 13:27:32 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-06 13:27:32 +0000 |
| commit | 99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c (patch) | |
| tree | ac908f44d77ed082b408c4ee884551d285327f3f | |
| parent | f6c28984f2568e3eee4ce988364075a31636b4f3 (diff) | |
| download | nixlib-99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c.tar nixlib-99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c.tar.gz nixlib-99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c.tar.bz2 nixlib-99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c.tar.lz nixlib-99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c.tar.xz nixlib-99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c.tar.zst nixlib-99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c.zip | |
Do not pass pkgs to virtuoso
svn path=/nixpkgs/trunk/; revision=20958
| -rw-r--r-- | pkgs/servers/sql/virtuoso/default.nix | 5 | ||||
| -rw-r--r-- | 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 c533da3f1d47..6730ce26fcd1 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 7a411eceea8e..f34c4f6fc534 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; |