diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-01-23 10:07:31 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 10:07:31 +0000 |
commit | f6a583eeece936a1d917de67194fec4b6c74cf1f (patch) | |
tree | 2720b9f35ccb4d9ae759c965dc8fba39c6199bca /pkgs/development/compilers/sbcl/2.0.9.nix | |
parent | 3698438873a314899ea8af763aa28577b2794fd5 (diff) | |
parent | acc5f7b18a60bc9b1024e5e1882bf7362e6492e6 (diff) |
Merge pull request #110465 from siraben/development-compilers-stdenv-lib
pkgs/development/compilers: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/compilers/sbcl/2.0.9.nix')
-rw-r--r-- | pkgs/development/compilers/sbcl/2.0.9.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/sbcl/2.0.9.nix b/pkgs/development/compilers/sbcl/2.0.9.nix index 148ecccf13165..ada098ec1829c 100644 --- a/pkgs/development/compilers/sbcl/2.0.9.nix +++ b/pkgs/development/compilers/sbcl/2.0.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, sbclBootstrap +{ lib, stdenv, fetchurl, writeText, sbclBootstrap , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) , disableImmobileSpace ? false @@ -70,17 +70,17 @@ stdenv.mkDerivation rec { export HOME=$PWD/test-home ''; - enableFeatures = with stdenv.lib; + enableFeatures = with lib; optional threadSupport "sb-thread" ++ optional stdenv.isAarch32 "arm"; - disableFeatures = with stdenv.lib; + disableFeatures = with lib; optional (!threadSupport) "sb-thread" ++ optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; buildPhase = '' sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ - stdenv.lib.concatStringsSep " " + lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) } @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { installPhase = '' INSTALL_ROOT=$out sh install.sh '' - + stdenv.lib.optionalString (!purgeNixReferences) '' + + lib.optionalString (!purgeNixReferences) '' cp -r src $out/lib/sbcl cp -r contrib $out/lib/sbcl cat >$out/lib/sbcl/sbclrc <<EOF @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { EOF ''; - setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" '' + setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" '' addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' |