Do not use top-level buildPythonPackage or buildPythonApplication

but instead use the one in pythonPackages.

4 files changed, 14 insertions, 13 deletions

diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 07dc229bcc2a..aeb0c5bf8ac7 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages, picocom
+{ stdenv, fetchurl, pythonPackages, picocom
 , avrdude, arduino-core, avrgcclibc }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "ino-0.3.6";
   namePrefix = "";
 
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index 34a45fa0b846..1020ed864dfb 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, buildPythonApplication, pythonPackages }:
+{ stdenv, fetchgit, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
 
   name = "grabserial-20141120";
   namePrefix = "";
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index b511b7d1948b..75d371b4ec8d 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonApplication, makeWrapper
+{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) python;
+in pythonPackages.mkPythonDerivation rec {
   name = "ycmd-2016-01-12";
+  namePrefix = "";
 
   src = fetchgit {
     url = "git://github.com/Valloric/ycmd.git";
@@ -10,13 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr";
   };
 
-  buildInputs = [ python cmake boost makeWrapper ];
+  buildInputs = [ cmake boost ];
 
   propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ];
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
-    python build.py --clang-completer --system-boost
+    ${python.interpreter} build.py --clang-completer --system-boost
   '';
 
   configurePhase = ":";
@@ -24,8 +27,6 @@ stdenv.mkDerivation rec {
   installPhase = with pythonPackages; ''
     mkdir -p $out/lib/ycmd/third_party $out/bin
     cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
-    wrapProgram $out/lib/ycmd/ycmd/__main__.py \
-      --prefix PYTHONPATH : "$(toPythonPath ${waitress}):$(toPythonPath ${frozendict}):$(toPythonPath ${bottle})"
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
   '';
 
diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix
index 58a857c22148..e0c897499d2a 100644
--- a/pkgs/development/tools/winpdb/default.nix
+++ b/pkgs/development/tools/winpdb/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, wxPython, makeDesktopItem }:
+{ stdenv, fetchurl, pythonPackages, makeDesktopItem }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "winpdb-1.4.8";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ buildPythonApplication rec {
     sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs";
   };
 
-  propagatedBuildInputs = [ wxPython ];
+  propagatedBuildInputs = [ pythonPackages.wxPython ];
 
   desktopItem = makeDesktopItem {
     name = "winpdb";