From 08f2ce1172b558ee1f447893ad392c27cea850ce Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 9 Jul 2014 00:15:22 -0400 Subject: [PATCH] Fix Python 3.{2,3,4} on Darwin. This removes the `-lcrypt` linker flag when compiling under Darwin. --- pkgs/development/interpreters/python/3.2/default.nix | 4 ++-- pkgs/development/interpreters/python/3.3/default.nix | 6 +++--- 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 c103b0f59cd..f474ae659de 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 f9f68b9323e..36be9e0dad6 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 c8d4b69b430..2ce4413a2c0 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 ]; }; }