diff options
author | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-01-14 16:39:34 +0100 |
commit | d2f98a5b0294b89f2b3fe5be97d546c758c0dfed (patch) | |
tree | 7848cf9962f89b36450ec4bf9be5c96c25ee0f3f /Makefile | |
parent | e789c2adadd3e6cd0627f5b6a43216fc634d0bc6 (diff) | |
parent | cf1c948f48a5e8c46159e984224cd1080da79c17 (diff) |
Merge remote-tracking branch 'gum/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 |