diff options
author | Domen Kožar <domen@dev.si> | 2015-02-08 20:43:32 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-02-08 20:43:44 +0100 |
commit | c0d814d62b6e67db07e80bb8a41b2a25ad035a8e (patch) | |
tree | efb993253970378692740178ce3248147f1c9d80 /pkgs/development/interpreters | |
parent | f02ccf6acd418e1e4d38ddb651f0d205838c3120 (diff) | |
download | nixlib-c0d814d62b6e67db07e80bb8a41b2a25ad035a8e.tar nixlib-c0d814d62b6e67db07e80bb8a41b2a25ad035a8e.tar.gz nixlib-c0d814d62b6e67db07e80bb8a41b2a25ad035a8e.tar.bz2 nixlib-c0d814d62b6e67db07e80bb8a41b2a25ad035a8e.tar.lz nixlib-c0d814d62b6e67db07e80bb8a41b2a25ad035a8e.tar.xz nixlib-c0d814d62b6e67db07e80bb8a41b2a25ad035a8e.tar.zst nixlib-c0d814d62b6e67db07e80bb8a41b2a25ad035a8e.zip |
pypy: fix build
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/pypy/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 62a0c0fb5a2f..f67c48c62d8d 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -81,6 +81,7 @@ let mkdir -p $out/{bin,include,lib,pypy-c} cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c + cp libpypy-c.so $out/lib/ ln -s $out/pypy-c/pypy-c $out/bin/pypy chmod +x $out/bin/pypy @@ -88,13 +89,12 @@ let ln -s $out/pypy-c/include $out/include/${libPrefix} ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} + wrapProgram "$out/bin/pypy" \ + --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ + --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" + # verify cffi modules $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" - - # make sure pypy finds sqlite3 library - wrapProgram "$out/bin/pypy" \ - --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}" \ - --set LIBRARY_PATH "${LIBRARY_PATH}" ''; passthru = rec { @@ -105,11 +105,11 @@ let interpreter = "${self}/bin/${executable}"; }; - enableParallelBuilding = true; + enableParallelBuilding = true; # almost no parallelization without STM meta = with stdenv.lib; { homepage = http://pypy.org/; - description = "Fast, compliant alternative implementation of the Python language (2.7.3)"; + description = "Fast, compliant alternative implementation of the Python language (2.7.8)"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ iElectric ]; |