ceph: use python2

print statement
NixOS · Oct 18, 2016 · 509ef43 · 509ef43
1 parent 939a7c2
commit 509ef43
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,6 +1,6 @@
 { stdenv, ensureNewerSourcesHook, autoconf, automake, makeWrapper, pkgconfig
 , libtool, which, git
-, boost, python, pythonPackages, libxml2, zlib
+, boost, python2Packages, libxml2, zlib
 
 # Optional Dependencies
 , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
@@ -30,6 +30,7 @@ assert cryptopp != null || (nss != null && nspr != null);
 with stdenv;
 with stdenv.lib;
 let
+  inherit (python2Packages) python;
   mkFlag = trueStr: falseStr: cond: name: val:
     if cond == null then null else
       "--${if cond != false then trueStr else falseStr}${name}"
@@ -99,7 +100,7 @@ let
   };
 
   wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
-    + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
+    + " --prefix PYTHONPATH : \"$(toPythonPath ${python2Packages.flask})\""
     + " --set PATH \"$out/bin\"";
 in
 stdenv.mkDerivation {
@@ -116,12 +117,12 @@ stdenv.mkDerivation {
     (ensureNewerSourcesHook { year = "1980"; })
   ]
     ++ optionals (versionAtLeast version "9.0.2") [
-      pythonPackages.setuptools pythonPackages.argparse
+      python2Packages.setuptools python2Packages.argparse
     ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
+    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc python2Packages.flask zlib
   ] ++ optionals (versionAtLeast version "9.0.0") [
-    pythonPackages.sphinx # Used for docs
+    python2Packages.sphinx # Used for docs
   ] ++ optionals stdenv.isLinux [
     linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
   ] ++ optionals hasServer [