From e52fc8f431ea0542a34b376e1e63a96681702d80 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Tue, 23 Jul 2013 23:24:51 +0200
Subject: [PATCH] pypy: fix stdenv.lib removal

---
 pkgs/development/interpreters/pypy/2.0/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix
index f689ef9db21..711c27fabf2 100644
--- a/pkgs/development/interpreters/pypy/2.0/default.nix
+++ b/pkgs/development/interpreters/pypy/2.0/default.nix
@@ -35,18 +35,15 @@ let
   '';
 
   buildInputs =
-    optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
+    stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
     [ bzip2 openssl pkgconfig pythonFull libffi ncurses ]
-    ++ optional zlibSupport zlib;
+    ++ stdenv.lib.optional zlibSupport zlib;
 
   pypy = stdenv.mkDerivation rec {
     name = "pypy-${version}";
 
     inherit majorVersion version src buildInputs;
 
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-
     preConfigure = ''
       substituteInPlace Makefile \
         --replace "-Ojit" "-Ojit --batch" \
@@ -86,4 +83,4 @@ let
     };
   };
 
-in pypy // { inherit modules; }
+in pypy