sbcl: remove obsolete dependency on which
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit", which }:
|
{ stdenv, fetchurl, sbclBootstrap, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "sbcl-${version}";
|
name = "sbcl-${version}";
|
||||||
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n";
|
sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ which ];
|
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
echo '"${version}.nixos"' > version.lisp-expr
|
echo '"${version}.nixos"' > version.lisp-expr
|
||||||
echo "
|
echo "
|
||||||
@@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||||||
'/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
|
'/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
|
||||||
|
|
||||||
# Fix software version retrieval
|
# Fix software version retrieval
|
||||||
sed -e "s@/bin/uname@$(which uname)@g" -i src/code/*-os.lisp
|
sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp
|
||||||
|
|
||||||
# Fix the tests
|
# Fix the tests
|
||||||
sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
|
sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
|
||||||
|
|||||||
Reference in New Issue
Block a user