X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fssh%2Fdefault.nix;h=aea3ac0e79d1554b2fe70d6d4d1308d4c12d02e9;hb=8a05c7fb2e7aad81ce4eb31b5173f4dabf353e31;hp=d4c1ab3ffac3b8c462b4ca5139d40c8c351555dc;hpb=1b9150a54b5cb0b512265cdcf88ad10c9a4a55b1;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/ssh/default.nix b/modules/private/ssh/default.nix
index d4c1ab3..aea3ac0 100644
--- a/modules/private/ssh/default.nix
+++ b/modules/private/ssh/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
 let
   cfg = config.myServices.ssh;
 in
@@ -56,7 +56,7 @@ in
       user = "nobody";
       group = "nogroup";
       permissions = "0400";
-      text = myconfig.env.sshd.ldap.password;
+      text = config.myEnv.sshd.ldap.password;
     }];
     system.activationScripts.sshd = {
       deps = [ "secrets" ];
@@ -77,12 +77,11 @@ in
         substituteAll ${./ldap_authorized_keys.sh} $out
         chmod a+x $out
         '';
-      ldap_authorized_keys =
-        pkgs.mylibs.wrap {
-          name = "ldap_authorized_keys";
-          file = fullScript;
-          paths = deps;
-        };
+      ldap_authorized_keys = pkgs.runCommand "ldap_authorized_keys" {
+        buildInputs = [ pkgs.makeWrapper ];
+      } ''
+        makeWrapper "${fullScript}" "$out" --prefix PATH : ${lib.makeBinPath deps}
+        '';
     in {
       enable = true;
       mode = "0755";