nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3: fix build after 5ff40dded, refactor

Browse Source 
The path list was passed in a format not suitable for gcc command-line.
Also, let's utilize that we had `with stdenv.lib;`.
/cc @abbradar.
This commit is contained in:
Vladimír Čunát 2016-04-26 10:40:39 +02:00
parent dc062f2c8e
commit 626e5bd4dd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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