forked from lix-project/lix
nix-shell -p: pass --arg values as nixpkgs params
This commit is contained in:
parent
2b67cb7b8c
commit
6eeb6f9c84
|
@ -269,7 +269,7 @@ static void main_nix_build(int argc, char * * argv)
|
|||
|
||||
if (packages) {
|
||||
std::ostringstream joined;
|
||||
joined << "with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) \"shell\" { buildInputs = [ ";
|
||||
joined << "{...}@args: with import <nixpkgs> args; (pkgs.runCommandCC or pkgs.runCommand) \"shell\" { buildInputs = [ ";
|
||||
for (const auto & i : left)
|
||||
joined << '(' << i << ") ";
|
||||
joined << "]; } \"\"";
|
||||
|
|
|
@ -54,6 +54,10 @@ nix-instantiate shell.nix -A shellDrv --add-root $TEST_ROOT/shell
|
|||
output=$(NIX_PATH=nixpkgs=shell.nix nix-shell --pure -p foo bar --run 'echo "$(foo) $(bar)"')
|
||||
[ "$output" = "foo bar" ]
|
||||
|
||||
# Test nix-shell -p --arg x y
|
||||
output=$(NIX_PATH=nixpkgs=shell.nix nix-shell --pure -p foo --argstr fooContents baz --run 'echo "$(foo)"')
|
||||
[ "$output" = "baz" ]
|
||||
|
||||
# Test nix-shell shebang mode
|
||||
sed -e "s|@ENV_PROG@|$(type -P env)|" shell.shebang.sh > $TEST_ROOT/shell.shebang.sh
|
||||
chmod a+rx $TEST_ROOT/shell.shebang.sh
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ inNixShell ? false, contentAddressed ? false }:
|
||||
{ inNixShell ? false, contentAddressed ? false, fooContents ? "foo" }:
|
||||
|
||||
let cfg = import ./config.nix; in
|
||||
with cfg;
|
||||
|
@ -62,7 +62,7 @@ let pkgs = rec {
|
|||
|
||||
foo = runCommand "foo" {} ''
|
||||
mkdir -p $out/bin
|
||||
echo 'echo foo' > $out/bin/foo
|
||||
echo 'echo ${fooContents}' > $out/bin/foo
|
||||
chmod a+rx $out/bin/foo
|
||||
ln -s ${shell} $out/bin/bash
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue