nix: shell: portability

diff --git a/servers/mermet.nix b/servers/mermet.nix
index 61de74c27dbb075ab7cce1bba7a137a2841904d9..88611b9e47a6b9f11d7afb1dd8059bb5b3b81b91 100644 (file)
--- a/servers/mermet.nix
+++ b/servers/mermet.nix
@@ -59,10 +59,12 @@ in
   environment = {
     systemPackages = with pkgs; [
       cryptsetup
+      direnv
       fio
       git
       gptfdisk
       lm_sensors
+      rsync
       smartctl-tbw
       socat
     ];

diff --git a/shell.nix b/shell.nix
index 40b06adebb4a1fa60512a79407dccea4adab5941..6bfd3393a17d491980dea626783eb3c2d8e71d01 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -94,6 +94,7 @@ pkgs.stdenv.mkDerivation {
     #pkgs.openssl
     pkgs.pass
     pkgs.procps
+    pkgs.rsync
     #pkgs.rxvt_unicode.terminfo
     #pkgs.sqlite
     pkgs.sqlite
@@ -131,7 +132,7 @@ pkgs.stdenv.mkDerivation {
     #NIX_PATH+=""
 
     # executables
-    PATH_NIX=$(dirname $(readlink -e ~/.nix-profile/bin/nix))
+    PATH_NIX="$(dirname "$(PATH="${builtins.getEnv "PATH"}"; which nix)")"
     PATH_NIXOS=/run/wrappers/bin
     PATH_FHS="$PWD"/.lib/nix/fhs-bin
     PATH_FHS_VBOX="$PWD"/.lib/fhs-vbox-bin