summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-11-19 23:36:52 +0100
committerJörg Thalheim <joerg@thalheim.io>2020-11-20 07:41:04 +0100
commitd9dfd892bfd410afad5722363c9f297ad4075175 (patch)
tree41af27a2803ca9f2774659714974ff75144d752b
parentc334743d6f3d4618025e100f336ece3ef5dc549d (diff)
mic92: improve tinc cross-compiling
-rw-r--r--krebs/3modules/tinc.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 0f5e1aa83..4252c8d3b 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -112,13 +112,15 @@ let
hostsArchive = mkOption {
type = types.package;
- default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} ''
+ default = pkgs.runCommand "retiolum-hosts.tar.bz2" {
+ nativeBuildInputs = [ pkgs.gnutar pkgs.coreutils ];
+ } ''
cp \
--no-preserve=mode \
--recursive \
${tinc.config.hostsPackage} \
hosts
- ${pkgs.gnutar}/bin/tar -cjf $out hosts
+ tar -cjf $out hosts
'';
readOnly = true;
};