abcl: follow up fixes for #223317

Signed-off-by: lucasew <lucas59356@gmail.com>
This commit is contained in:
lucasew 2023-04-07 19:36:52 -03:00
parent d294db09cb
commit 9071d06d01
2 changed files with 6 additions and 4 deletions

View File

@ -29,9 +29,11 @@ stdenv.mkDerivation rec {
runHook postConfigure runHook postConfigure
''; '';
buildInputs = [ jre ant jdk jre ]; buildInputs = [ jre ];
nativeBuildInputs = [ makeWrapper ]; # note for the future:
# if you use makeBinaryWrapper, you will trade bash for glibc, the closure will be slightly larger
nativeBuildInputs = [ makeWrapper ant jdk ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild

View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update curl #!nix-shell -i bash -p nix-update subversion
new_version=$(curl https://armedbear.common-lisp.dev/ | grep abcl-src | sed 's;[^>]*>abcl-src-\(.*\).tar[^$]*;\1;' | head -n 1) new_version=$(svn ls https://abcl.org/svn/tags | tail -1 | tr -d /)
nix-update abcl --version "$new_version" nix-update abcl --version "$new_version"