diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-11-30 00:34:23 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-11-30 00:34:23 +0200 |
| commit | 8a4d6516ee6d6f526543fba01b2b6814fadf6c4e (patch) | |
| tree | 0996f477a4a0badf9a1b6cf0aa7c9aa4da3256b9 /pkgs/development/interpreters | |
| parent | 56366b5e668d4d5086cbadbb04c5dbc01a798581 (diff) | |
| parent | 2587611ed5916e8fad810a4a2038e12ed85337c0 (diff) | |
| download | nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.gz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.bz2 nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.lz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.xz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.zst nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.zip | |
Merge remote-tracking branch 'upstream/staging' into master
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pixie/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 97f8f61a98e6..05ef07961210 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -55,7 +55,8 @@ ''; # make check doesn't work on darwin - doCheck = !stdenv.isDarwin; + # On i686-linux we got some error that doesn't always appear. + doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux"); setupHook = ./setup-hook-2.0.sh; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index c3da770a6e1f..7cb2a356f951 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python, makeWrapper, pkgconfig, gcc, +{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -36,7 +36,7 @@ let buildInputs = [ pkgconfig makeWrapper ]; PYTHON = if buildWithPypy then "${pypy}/pypy-c/.pypy-c-wrapped" - else "${python}/bin/python"; + else "${python2.interpreter}"; unpackPhase = '' cp -R ${pixie-src} pixie-src mkdir pypy-src |