From db8068e92529d6b495488be340ddcf16752d83d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 12:07:13 +0100 Subject: [PATCH] arangodb: use python2 --- pkgs/servers/nosql/arangodb/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 8b8d1ba0ae1..c40b765d345 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, openssl, zlib, python, gyp, bash, go, readline }: +{ stdenv, fetchFromGitHub, openssl, zlib, python2Packages, bash, go, readline }: -stdenv.mkDerivation rec { +let + inherit (python2Packages) python gyp; +in stdenv.mkDerivation rec { version = "2.5.3"; name = "arangodb-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 475d8e2b616..cb9c315c855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,9 +429,7 @@ in arandr = callPackage ../tools/X11/arandr { }; - arangodb = callPackage ../servers/nosql/arangodb { - inherit (pythonPackages) gyp; - }; + arangodb = callPackage ../servers/nosql/arangodb { }; arcanist = callPackage ../development/tools/misc/arcanist {};