From 3637b00f3897c47bdd07918e351b6ddd738a40ad Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Fri, 3 Jun 2022 11:42:08 +0100 Subject: [PATCH] Add lz4 to path to ensure the backup helpers can work --- flake.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index d2340bf..6ccfb2c 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,8 @@ # We want to produce a package with all of these together, with wrappers that let them # refer to each other by name (i.e. have each other on the path). - # ATM it's just Datman that needs them on the PATH. + # Datman needs the helpers on the path. + # The helpers need lz4 on the path. allInOne = pkgs.stdenv.mkDerivation { name = "datman-aio"; @@ -45,6 +46,7 @@ ln -s ${rustComponents}/bin/{yama,datman} $out/bin ln -s ${mysqlHelper}/bin/datman-helper-mysql-{backup,restore} $out/bin ln -s ${postgresHelper}/bin/datman-helper-postgres-{backup,restore} $out/bin + ln -s ${pkgs.lz4}/bin/lz4 $out/bin/ runHook postInstall ''; @@ -52,10 +54,9 @@ postInstall = '' # set -eu - #for fn in $out/bin/{datman,yama,datman-helper-{mysql,postgres}-{backup,restore}}; do - # wrapProgram $fn --suffix PATH : $out/bin - #done - wrapProgram $out/bin/datman --suffix PATH : $out/bin + for fn in $out/bin/{datman,yama,datman-helper-{mysql,postgres}-{backup,restore}}; do + wrapProgram $fn --suffix PATH : $out/bin + done ''; }; in rec {