diff options
Diffstat (limited to 'pkgs/development/interpreters')
3 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 04d6c706b46c..f013f6ec3727 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -28,7 +28,7 @@ let }; # TODO: Add a "dev" output containing the header files. - outputs = [ "out" "man" "docdev" ]; + outputs = [ "out" "man" "devdoc" ]; setOutputFlags = false; patches = diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index e5c33cd7b2bd..5311be697afe 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, less, includeModules ? false +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false , sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage , python26Packages }: @@ -53,8 +53,6 @@ let [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; - propagatedBuildInputs = [ less ]; - mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; LIBRARY_PATH = makeLibraryPath paths; @@ -66,8 +64,8 @@ let name = "python${if includeModules then "" else "-minimal"}-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs propagatedBuildInputs - preConfigure configureFlags; + inherit majorVersion version src patches buildInputs preConfigure + configureFlags; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 96c098c82dca..5f15db26ebc3 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, self, callPackage, python27Packages , bzip2, openssl, gettext -, less , includeModules ? false @@ -109,7 +108,7 @@ let ++ optional zlibSupport zlib ++ optional stdenv.isDarwin CF; - propagatedBuildInputs = [ less ] ++ optional stdenv.isDarwin configd; + propagatedBuildInputs = optional stdenv.isDarwin configd; mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; |