From b681a83e8aa55b28c104e32acdbdb98fc3caf429 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 6 Dec 2017 13:51:19 +0100
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ymir.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ymir.nix b/ymir.nix
index c779201f..dc6fa19c 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -122,7 +122,7 @@ in rec {
  
         printf "%s/%s/%s" "''${baseUrl}" "''${prefix}" "''${filename}"
       '';
-      pam-pwdfile = pkgs.stdenv.mkDerivation rec {
+      pam_pwdfile = pkgs.stdenv.mkDerivation rec {
         name = "pam-pwdfile-${version}";
         version = "1.0";
         src = pkgs.fetchFromGitHub {
@@ -132,7 +132,7 @@ in rec {
           sha256 = "0sjzwsnlf1g0xbingmjvb9gh8lnwzkkfzw10194ibnppdn4gy0zy";
         };
 
-        buildInputs = [ pam ];
+        buildInputs = with pkgs; [ pam ];
       };
     };
 
@@ -1005,7 +1005,7 @@ in rec {
   };
 
   security.pam.services."vsftpd".text = ''
-    auth required ${pkgs.pam-pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd
+    auth required ${pkgs.pam_pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd
     account required pam_permit.so
   '';
 }
-- 
cgit v1.2.3