lispPackages: A less aggressive way to manipulate ASDF search path, as suggested by Fare
This commit is contained in:
@@ -28,13 +28,8 @@ in
|
||||
propagatedBuildInputs = [pkgs.fuse];
|
||||
overrides = y : (x.overrides y) // {
|
||||
configurePhase = ''
|
||||
export SAVED_CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY"
|
||||
export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
|
||||
export makeFlags="$makeFlags LISP=common-lisp.sh"
|
||||
'';
|
||||
preInstall = ''
|
||||
export CL_SOURCE_REGISTRY="$SAVED_CL_SOURCE_REGISTRY"
|
||||
'';
|
||||
};
|
||||
};
|
||||
hunchentoot = addNativeLibs [pkgs.openssl];
|
||||
@@ -65,7 +60,8 @@ in
|
||||
overrides = y: (x.overrides y) // {
|
||||
linkedSystems = [];
|
||||
postInstall = ((x.overrides y).postInstall or "") + ''
|
||||
export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
|
||||
export NIX_LISP_ASDF_PATHS="$NIX_LISP_ASDF_PATHS
|
||||
$out/lib/common-lisp/query-fs"
|
||||
export HOME=$PWD
|
||||
"$out/bin/query-fs-lisp-launcher.sh" --eval '(asdf:make :query-fs)' \
|
||||
--eval "(progn $(for i in $linkedSystems; do echo "(asdf:make :$i)"; done) )" \
|
||||
|
||||
Reference in New Issue
Block a user