diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-11-22 07:55:06 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-11-22 07:56:17 +0100 |
| commit | 4db842f465f06f16a64eb2651cd863b5b44b2b74 (patch) | |
| tree | cd8072d691b0c58cdf459ecba50781041570b611 /pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | |
| parent | a1e340fab212c10d121771c7bce7d2b1e99af516 (diff) | |
| download | nixpkgs-4db842f465f06f16a64eb2651cd863b5b44b2b74.tar nixpkgs-4db842f465f06f16a64eb2651cd863b5b44b2b74.tar.gz nixpkgs-4db842f465f06f16a64eb2651cd863b5b44b2b74.tar.bz2 nixpkgs-4db842f465f06f16a64eb2651cd863b5b44b2b74.tar.lz nixpkgs-4db842f465f06f16a64eb2651cd863b5b44b2b74.tar.xz nixpkgs-4db842f465f06f16a64eb2651cd863b5b44b2b74.tar.zst nixpkgs-4db842f465f06f16a64eb2651cd863b5b44b2b74.zip | |
lispPackages: A less aggressive way to manipulate ASDF search path, as suggested by Fare
Diffstat (limited to 'pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix')
| -rw-r--r-- | pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index a20b19643d3..0f9761b0fcf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -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) )" \ |