From b2c609c3ac70b81e38f2afb346aa46fc36d0e251 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Wed, 20 Jan 2021 15:22:09 +0100 Subject: [PATCH] chore: Nix: set up LEAN_SYSROOT automatically in server --- nix/buildLeanPackage.nix | 4 ++-- nix/lean-dev.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/buildLeanPackage.nix b/nix/buildLeanPackage.nix index 916bfeba3b..80a7b9e6bf 100644 --- a/nix/buildLeanPackage.nix +++ b/nix/buildLeanPackage.nix @@ -111,10 +111,10 @@ with builtins; let modMap' = lib.foldr buildModAndDeps modMap deps; in modMap' // { ${mod} = buildMod mod (map (dep: if modMap' ? ${dep} then modMap'.${dep} else externalModMap.${dep}) deps); }; makeEmacsWrapper = name: lean: writeShellScriptBin name '' - LEAN_SYSROOT=${lean} ${lean-emacs}/bin/emacs --eval "(progn (setq lean4-rootdir \"${lean}\") (require 'lean4-mode))" "$@" + ${lean-emacs}/bin/emacs --eval "(progn (setq lean4-rootdir \"${lean}\") (require 'lean4-mode))" "$@" ''; makeVSCodeWrapper = name: lean: writeShellScriptBin name '' - LEAN_SYSROOT=${lean} PATH=${lean}/bin:$PATH ${lean-vscode}/bin/code "$@" + PATH=${lean}/bin:$PATH ${lean-vscode}/bin/code "$@" ''; printPaths = deps: writeShellScriptBin "print-paths" '' echo "${depRoot "print-paths" deps}" diff --git a/nix/lean-dev.in b/nix/lean-dev.in index 2a30075b2f..bb9de7a3eb 100644 --- a/nix/lean-dev.in +++ b/nix/lean-dev.in @@ -9,4 +9,4 @@ args=(-- "$@") # HACK: use stage 0 instead of 1 inside Lean's own `src/` [[ -d Lean && -f ../flake.nix ]] && target="@srcTarget@" && args=@srcArgs@ -@nix@/bin/nix run "$target" ${args[*]} +LEAN_SYSROOT="$(dirname "$0")/.." @nix@/bin/nix run "$target" ${args[*]}