diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 11:50:34 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 20:30:29 +1000 |
| commit | c59c4e358989ce49afd177e6899549fbb8f8bf7f (patch) | |
| tree | 52ab48d31449950028e1dcd461abbb8b58442212 /nixos/modules/services/networking/flannel.nix | |
| parent | 3f175184904d925ad21bf07b1c783d2977a5a4c5 (diff) | |
| download | nixpkgs-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar nixpkgs-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.gz nixpkgs-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.bz2 nixpkgs-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.lz nixpkgs-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.xz nixpkgs-c59c4e358989ce49afd177e6899549fbb8f8bf7f.tar.zst nixpkgs-c59c4e358989ce49afd177e6899549fbb8f8bf7f.zip | |
nixos/*: use $out instead of $bin with buildGoPackage
Diffstat (limited to 'nixos/modules/services/networking/flannel.nix')
| -rw-r--r-- | nixos/modules/services/networking/flannel.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index dd2f6454e95..4c040112d28 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -19,8 +19,8 @@ in { package = mkOption { description = "Package to use for flannel"; type = types.package; - default = pkgs.flannel.bin; - defaultText = "pkgs.flannel.bin"; + default = pkgs.flannel; + defaultText = "pkgs.flannel"; }; publicIp = mkOption { @@ -167,7 +167,7 @@ in { touch /run/flannel/docker '' + optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" - until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do echo "setting network configuration, retry" sleep 1 |