diff options
| author | Bastien Riviere <babathriviere@gmail.com> | 2021-06-23 12:24:20 +0200 |
|---|---|---|
| committer | Bastien Riviere <babathriviere@gmail.com> | 2021-06-23 16:16:45 +0200 |
| commit | e234811bb075fd88dc7f52b7122f04f66b042398 (patch) | |
| tree | 4d9e6bf7f2d5f5740144b001e94b5a6fe55f78c5 /pkgs/development/tools/misc | |
| parent | a6bb32aeccb5cf66e657cc044baf1609ee1cd5e2 (diff) | |
| download | nixpkgs-e234811bb075fd88dc7f52b7122f04f66b042398.tar nixpkgs-e234811bb075fd88dc7f52b7122f04f66b042398.tar.gz nixpkgs-e234811bb075fd88dc7f52b7122f04f66b042398.tar.bz2 nixpkgs-e234811bb075fd88dc7f52b7122f04f66b042398.tar.lz nixpkgs-e234811bb075fd88dc7f52b7122f04f66b042398.tar.xz nixpkgs-e234811bb075fd88dc7f52b7122f04f66b042398.tar.zst nixpkgs-e234811bb075fd88dc7f52b7122f04f66b042398.zip | |
clojure-lsp: fix compilation on darwin
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/clojure-lsp/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 3f51136c65c..095968a2d08 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { GRAALVM_HOME = graalvm11-ce; CLOJURE_LSP_JAR = jar; + CLOJURE_LSP_XMX = "-J-Xmx4g"; + + patches = lib.optionals stdenv.isDarwin [ ./disable-check-toolchain.patch ]; buildInputs = [ graalvm11-ce ]; @@ -52,7 +55,7 @@ stdenv.mkDerivation rec { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; - maintainers = [ maintainers.ericdallo ]; + maintainers = [ maintainers.ericdallo maintainers.babariviere ]; platforms = graalvm11-ce.meta.platforms; }; } diff --git a/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch b/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch new file mode 100644 index 00000000000..402189627c2 --- /dev/null +++ b/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch @@ -0,0 +1,12 @@ +diff --git a/graalvm/native-unix-compile.sh b/graalvm/native-unix-compile.sh +index ec0e49f..e19a120 100755 +--- a/graalvm/native-unix-compile.sh ++++ b/graalvm/native-unix-compile.sh +@@ -17,6 +17,7 @@ CLOJURE_LSP_XMX=${CLOJURE_LSP_XMX:-"-J-Xmx4g"} + + args=("-jar" "$CLOJURE_LSP_JAR" + "-H:+ReportExceptionStackTraces" ++ "-H:-CheckToolchain" + "--verbose" + "--no-fallback" + "--native-image-info" |