diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/development/compilers/sbcl/default.nix | |
parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) | |
download | nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2 nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst nixpkgs-30f14243c33f1b386273d08a4776aa679c42143d.zip |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'pkgs/development/compilers/sbcl/default.nix')
-rw-r--r-- | pkgs/development/compilers/sbcl/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index ab8e8e08b1a..946205011f2 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" +, threadSupport ? (stdenv.isi686 || stdenv.isx86_64) # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. # Note that the created binaries still need `patchelf --set-interpreter ...` # to get rid of ${glibc} dependency. @@ -8,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0kzvwzz196ws9z20l8fm15m5gckhmkkc6lxvdib12mfvy80gcf6v"; + sha256 = "0zx6z43xfnw1b6v5d3bpjrwgqs14wxlji22nl0lr4wmzbfbzvqli"; }; patchPhase = '' @@ -23,10 +24,11 @@ stdenv.mkDerivation rec { (pushnew x features)) (disable (x) (setf features (remove x features)))) - #-arm - (enable :sb-thread) - #+arm - (enable :arm))) " > customize-target-features.lisp + '' + + stdenv.lib.optionalString threadSupport "(enable :sb-thread)" + + stdenv.lib.optionalString stdenv.isArm "(enable :arm)" + + '' + )) " > customize-target-features.lisp pwd |