diff options
| author | miefda <miefda@miefda.de> | 2015-12-30 18:24:44 +0100 |
|---|---|---|
| committer | miefda <miefda@miefda.de> | 2015-12-30 18:24:44 +0100 |
| commit | c562e447ba927ea20bf7d2dfff9a4f4807ee4463 (patch) | |
| tree | 57f5496e7acbc9dfeec7f406a6857687219625d0 /Makefile | |
| parent | b96fd072e1ac5e5b6b5b3e92c678dc4bb4cb7e1f (diff) | |
| parent | 9b890750e24f43182ebf1732871a60d9e0c74c89 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -35,7 +35,7 @@ ifeq ($(filter),json) else filter() { cat; } endif - nix-instantiate \ + result=$$(nix-instantiate \ $${extraArgs-} \ --eval \ -A "$$get" \ @@ -45,8 +45,9 @@ endif --argstr current-host-name "$$HOSTNAME" \ --argstr current-user-name "$$LOGNAME" \ $${system+--argstr system "$$system"} \ - $${target+--argstr target "$$target"} \ - | filter + $${target+--argstr target "$$target"}) + echo "$$result" | filter + else $(error unbound variable: system[s]) endif |