summary refs log tree commit diff
path: root/pkgs/development/lisp-modules/define-package.nix
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-11-22 07:55:06 +0100
committerMichael Raskin <7c6f434c@mail.ru>2017-11-22 07:56:17 +0100
commit4db842f465f06f16a64eb2651cd863b5b44b2b74 (patch)
treecd8072d691b0c58cdf459ecba50781041570b611 /pkgs/development/lisp-modules/define-package.nix
parenta1e340fab212c10d121771c7bce7d2b1e99af516 (diff)
downloadnixpkgs-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/define-package.nix')
-rw-r--r--pkgs/development/lisp-modules/define-package.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 1a155b3e933..0224bf16ab7 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -29,7 +29,7 @@ let
     echo "source '$path_config_script'" >> "$config_script"
     echo "fi" >> "$config_script"
     echo "if test -z \"\''${_''${outhash}_NIX_LISP_PATH_CONFIG}\"; then export _''${outhash}_NIX_LISP_PATH_CONFIG=1; " >> "$path_config_script"
-    echo "for i in \"''${CL_SOURCE_REGISTRY//:/\" \"}\" \"$out/lib/common-lisp/${args.baseName}/\" ; do echo \"\$CL_SOURCE_REGISTRY\" | grep -E \"(^|:)\$i(:|\\\$)\" >/dev/null || export CL_SOURCE_REGISTRY=\"\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}\$i\"; done;" >> "$path_config_script"
+    echo "export NIX_LISP_ASDF_PATHS=\"$( ( echo "\$NIX_LISP_ASDF_PATHS"; echo "$NIX_LISP_ASDF_PATHS"; echo "$out/lib/common-lisp/${args.baseName}" ) | grep . | sort | uniq)\"" >> "$path_config_script"
     test -n "$LD_LIBRARY_PATH" &&
         echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script"
     test -n "$NIX_LISP_LD_LIBRARY_PATH" &&