Merge branch 'master.upstream' into staging.upstream

2015-10-15 10:22:28 -07:00
parent 1283e3da5d 62e676b959
commit 8a44a36ca4
433 changed files with 31372 additions and 6980 deletions
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
      --add-flags "--core $out/share/sbcl/sbcl.core"
  '';

-  postFixup = stdenv.lib.optionalString (!stdenv.isArm) ''
+  postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) ''
    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
  '';