diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2014-07-09 00:15:22 -0400 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2014-07-09 00:18:11 -0400 |
commit | 08f2ce1172b558ee1f447893ad392c27cea850ce (patch) | |
tree | ba266fffc0dd71df4c9b73e3761da33c24f703b3 /pkgs/development/interpreters/python | |
parent | 1e5528c15ae9503c271b89dd4780167a369747c9 (diff) | |
download | nixlib-08f2ce1172b558ee1f447893ad392c27cea850ce.tar nixlib-08f2ce1172b558ee1f447893ad392c27cea850ce.tar.gz nixlib-08f2ce1172b558ee1f447893ad392c27cea850ce.tar.bz2 nixlib-08f2ce1172b558ee1f447893ad392c27cea850ce.tar.lz nixlib-08f2ce1172b558ee1f447893ad392c27cea850ce.tar.xz nixlib-08f2ce1172b558ee1f447893ad392c27cea850ce.tar.zst nixlib-08f2ce1172b558ee1f447893ad392c27cea850ce.zip |
Fix Python 3.{2,3,4} on Darwin.
This removes the `-lcrypt` linker flag when compiling under Darwin.
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/3.2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/3.3/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/3.4/default.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index c103b0f59cde..f474ae659deb 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index f9f68b9323e1..36be9e0dad63 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index c8d4b69b4309..2ce4413a2c09 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -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 ]; }; } |