diff options
| author | lassulus <lass@aidsballs.de> | 2015-12-24 11:14:54 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-12-24 11:14:54 +0100 |
| commit | d7741ca83f8c3ebe8a283c3231a9bf17bf05d94c (patch) | |
| tree | cc4a5ab6e1284d9a32fab80b4ecab6a5834208a0 /Makefile | |
| parent | 57feffb3f65876cca3f10ef82e6e82283c02852d (diff) | |
| parent | 6e4351044195f1f3b5708785e760b9d118e2c229 (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 |