alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #3217 from cstrahan/fix-darwin-python

Browse source 
Fix Python 3.{2,3,4} on Darwin.
This commit is contained in:
Peter Simons 2014-07-10 13:20:48 +02:00
parent a77078b84a 08f2ce1172
commit f5756aa3bb
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/interpreters/python/3.2/default.nix
View file

@ -49,7 +49,7 @@ stdenv.mkDerivation {
configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
@ -88,6 +88,6 @@ stdenv.mkDerivation {
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ];
};
}

6
pkgs/development/interpreters/python/3.3/default.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation {
configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
@ -84,7 +84,7 @@ stdenv.mkDerivation {
high level dynamic data types.
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ];
};
}

6
pkgs/development/interpreters/python/3.4/default.nix
View file

@ -45,7 +45,7 @@ stdenv.mkDerivation {
configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
@ -85,7 +85,7 @@ stdenv.mkDerivation {
high level dynamic data types.
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
};
}