babashka: remove rlwrap
Babashka now includes JLine, rlwrap is no longer needed.
This commit is contained in:
@@ -1,22 +1,11 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
babashka-unwrapped,
|
||||
callPackage,
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
rlwrap,
|
||||
clojureToolsBabashka ? callPackage ./clojure-tools.nix { },
|
||||
jdkBabashka ? clojureToolsBabashka.jdk,
|
||||
|
||||
# rlwrap is a small utility to allow the editing of keyboard input, see
|
||||
# https://book.babashka.org/#_repl
|
||||
#
|
||||
# NOTE In some cases, rlwrap prints some extra empty lines. That behavior can
|
||||
# break some babashka scripts. For this reason, it is disabled by default. See:
|
||||
# https://github.com/NixOS/nixpkgs/issues/246839
|
||||
# https://github.com/NixOS/nixpkgs/pull/248207
|
||||
withRlwrap ? false,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "babashka";
|
||||
@@ -30,28 +19,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
unwrapped-bin = "${babashka-unwrapped}/bin/bb";
|
||||
in
|
||||
''
|
||||
mkdir -p $out/clojure_tools
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/*
|
||||
installPhase = ''
|
||||
mkdir -p $out/clojure_tools
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn
|
||||
ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/*
|
||||
|
||||
makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
|
||||
--inherit-argv0 \
|
||||
--set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
|
||||
--set-default JAVA_HOME ${jdkBabashka}
|
||||
makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \
|
||||
--inherit-argv0 \
|
||||
--set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \
|
||||
--set-default JAVA_HOME ${jdkBabashka}
|
||||
|
||||
installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
|
||||
installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb
|
||||
installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
|
||||
''
|
||||
+ lib.optionalString withRlwrap ''
|
||||
substituteInPlace $out/bin/bb \
|
||||
--replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"'
|
||||
'';
|
||||
installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash
|
||||
installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb
|
||||
installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
${babashka-unwrapped.installCheckPhase}
|
||||
|
||||
Reference in New Issue
Block a user