cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #225235 from lucasew/abcl-followup

Browse source 
abcl: follow up fixes for #223317
This commit is contained in:
7c6f434c 2023-04-09 08:04:02 +00:00 committed by GitHub
commit 4baebf42f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/abcl/default.nix
View file

@ -29,9 +29,11 @@ stdenv.mkDerivation rec {
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 = ''
runHook preBuild

4
pkgs/development/compilers/abcl/update.sh
View file

@ -1,5 +1,5 @@
#!/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"