Skip to content

Commit

Permalink
lispPackages.clwrapper: use bash as the wrapper shell to make sure ar…
Browse files Browse the repository at this point in the history
…ays are supported
  • Loading branch information
7c6f434c committed Feb 17, 2018
1 parent 2e33da9 commit 8de132f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -1,4 +1,4 @@
#!@stdenv_shell@
#!@bash@/bin/bash
# Part of NixPkgs package collection
# This script can be used at your option under the same license as NixPkgs or
# under MIT/X11 license
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/lisp-modules/clwrapper/default.nix
@@ -1,4 +1,4 @@
{stdenv, fetchurl, asdf, which, lisp ? null}:
{stdenv, fetchurl, asdf, which, bash, lisp ? null}:
stdenv.mkDerivation {
name = "cl-wrapper-script";

Expand Down Expand Up @@ -36,7 +36,7 @@ stdenv.mkDerivation {

buildInputs = [which];

inherit asdf lisp;
inherit asdf lisp bash;
stdenv_shell = stdenv.shell;

setupHook = ./setup-hook.sh;
Expand Down

4 comments on commit 8de132f

@vcunat
Copy link
Member

@vcunat vcunat commented on 8de132f Feb 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcunat
Copy link
Member

@vcunat vcunat commented on 8de132f Feb 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, the wrapper is sourced :-)

@vcunat
Copy link
Member

@vcunat vcunat commented on 8de132f Feb 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stdenv shell is always bash, BTW. We rely on that in stdenv.

@7c6f434c
Copy link
Member Author

@7c6f434c 7c6f434c commented on 8de132f Feb 17, 2018 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.