From 626e5bd4dd94b04f51638cc48ac85fc658c7cc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 26 Apr 2016 10:40:39 +0200 Subject: [PATCH] python3: fix build after 5ff40dded, refactor 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. --- .../interpreters/python/3.4/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 6a3ab25c5d4..517dfc3d8b2 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -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 ]; }; }