diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-25 11:53:51 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2018-02-25 18:10:58 +0100 |
| commit | a035714be9ead0f48a5a44634d75ae730faedad1 (patch) | |
| tree | 9cbf144ffd109322e380e6a2c3208e5d33aae58d /pkgs/development/lisp-modules | |
| parent | 0fadb81af44fe7f43581a276d2ca863bdb64dd67 (diff) | |
| download | nixlib-a035714be9ead0f48a5a44634d75ae730faedad1.tar nixlib-a035714be9ead0f48a5a44634d75ae730faedad1.tar.gz nixlib-a035714be9ead0f48a5a44634d75ae730faedad1.tar.bz2 nixlib-a035714be9ead0f48a5a44634d75ae730faedad1.tar.lz nixlib-a035714be9ead0f48a5a44634d75ae730faedad1.tar.xz nixlib-a035714be9ead0f48a5a44634d75ae730faedad1.tar.zst nixlib-a035714be9ead0f48a5a44634d75ae730faedad1.zip | |
lispPackages: remove trailing colon from {NIX_LISP_,}LD_LIBRARY_PATH
Diffstat (limited to 'pkgs/development/lisp-modules')
| -rwxr-xr-x | pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/lisp-modules/define-package.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 522d2c252684..65fb6e615f5f 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -13,7 +13,7 @@ shift export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS test -n "$NIX_LISP_LD_LIBRARY_PATH" && - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH" declare -a NIX_LISP_FINAL_PARAMETERS; diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index b13ddf8357f4..390e0e061128 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -33,7 +33,7 @@ let 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" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':')'" >> "$path_config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':' | sed -e 's/:$//')'" >> "$path_config_script" echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" echo "#! /bin/sh" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" - echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" + echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; moveAsdFiles = '' |