mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
Fix Python 3.{2,3,4} on Darwin.
This removes the `-lcrypt` linker flag when compiling under Darwin.
This commit is contained in:
parent
1e5528c15a
commit
08f2ce1172
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user