public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Python 3.{2,3,4} on Darwin.

Browse Source 
This removes the `-lcrypt` linker flag when compiling under Darwin.
This commit is contained in:
Charles Strahan 2014-07-09 00:15:22 -04:00
parent 1e5528c15a
commit 08f2ce1172
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 configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") 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; license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all; 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 configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") 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. high level dynamic data types.
''; '';
license = stdenv.lib.licenses.psfl; license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; 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 configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") 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. high level dynamic data types.
''; '';
license = stdenv.lib.licenses.psfl; license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
}; };
} }