summary refs log tree commit diff
path: root/pkgs/build-support/emacs/wrapper.nix
diff options
context:
space:
mode:
authorMichael Alan Dorman <mdorman@ironicdesign.com>2017-08-03 20:24:55 -0400
committerMichael Alan Dorman <mdorman@ironicdesign.com>2017-08-04 07:52:18 -0400
commitef5ba4d5b29e329ab4240120870ef4d860ebd54e (patch)
tree04184a27482f8e16e00a2fc23c823c98480a1446 /pkgs/build-support/emacs/wrapper.nix
parent5b3e403eca517a090f1d98c4cd504762257276a8 (diff)
downloadnixlib-ef5ba4d5b29e329ab4240120870ef4d860ebd54e.tar
nixlib-ef5ba4d5b29e329ab4240120870ef4d860ebd54e.tar.gz
nixlib-ef5ba4d5b29e329ab4240120870ef4d860ebd54e.tar.bz2
nixlib-ef5ba4d5b29e329ab4240120870ef4d860ebd54e.tar.lz
nixlib-ef5ba4d5b29e329ab4240120870ef4d860ebd54e.tar.xz
nixlib-ef5ba4d5b29e329ab4240120870ef4d860ebd54e.tar.zst
nixlib-ef5ba4d5b29e329ab4240120870ef4d860ebd54e.zip
Fix emacs wrapper expression to honor bash array use
In 8d76eff, @Ericson2314 changed the representation of the value that
`findInputs` generated from a whitespace-separated bunch strings to an
actual array of strings.

Expressions that *consume* that value, however, also needed to be
changed to iterate over all the contents of the array, else they would
only select the first value, which turns out to be somewhat limiting.

Fixes #27873
Diffstat (limited to 'pkgs/build-support/emacs/wrapper.nix')
-rw-r--r--pkgs/build-support/emacs/wrapper.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index e41b1fd6a215..bd733f1b9baf 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -80,7 +80,8 @@ stdenv.mkDerivation {
        linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp"
      }
 
-     for pkg in $requires; do
+     # Iterate over the array of inputs (avoiding nix's own interpolation)
+     for pkg in "''${requires[@]}"; do
        linkEmacsPackage $pkg
      done