ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

python3*: port the fix from parent commit

Browse Source 
I really love such copied expressions...
but this case was easy compared to usual consequences
of file-copying in long-running branches.
This commit is contained in:
Vladimír Čunát 2016-04-26 10:50:48 +02:00
parent 626e5bd4dd
commit 387915e99c
3 changed files with 12 additions and 12 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

@ -44,8 +44,8 @@ stdenv.mkDerivation {
${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}" CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
LDFLAGS="${makeLibraryPath buildInputs}" LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
) )
''; '';

4
pkgs/development/interpreters/python/3.3/default.nix
View File

@ -46,8 +46,8 @@ stdenv.mkDerivation {
${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
configureFlagsArray=( --enable-shared --with-threads configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}" CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
LDFLAGS="${makeLibraryPath buildInputs}" LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
) )
''; '';

16
pkgs/development/interpreters/python/3.5/default.nix
View File

@ -35,16 +35,16 @@ stdenv.mkDerivation {
pythonVersion = majorVersion; pythonVersion = majorVersion;
inherit majorVersion version; inherit majorVersion version;
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ]; buildInputs = optionals stdenv.isDarwin [ CF configd ];
src = fetchurl { src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6"; sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6";
}; };
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = optionalString stdenv.isDarwin ''
substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
''; '';
@ -58,8 +58,8 @@ stdenv.mkDerivation {
''} ''}
configureFlagsArray=( --enable-shared --with-threads configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}" CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
LDFLAGS="${makeLibraryPath buildInputs}" LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
) )
''; '';
@ -113,8 +113,8 @@ stdenv.mkDerivation {
hierarchical packages; exception-based error handling; and very hierarchical packages; exception-based error handling; and very
high level dynamic data types. high level dynamic data types.
''; '';
license = stdenv.lib.licenses.psfl; license = licenses.psfl;
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ]; maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ];
}; };
} }