python3: Use correct build inputs for multi-output deps

Without this, python will silently build without native extensions (e.g
openssl); this causes wget to fail its tests for instance.

vcunat added python-3.5.

Changed files
+8 -8
pkgs
development
interpreters
+2 -2
pkgs/development/interpreters/python/3.2/default.nix
···
${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
-
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+
LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
+2 -2
pkgs/development/interpreters/python/3.3/default.nix
···
${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
configureFlagsArray=( --enable-shared --with-threads
-
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+
LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
+2 -2
pkgs/development/interpreters/python/3.4/default.nix
···
''}
configureFlagsArray=( --enable-shared --with-threads
-
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+
LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
+2 -2
pkgs/development/interpreters/python/3.5/default.nix
···
''}
configureFlagsArray=( --enable-shared --with-threads
-
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+
LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';