diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-09-24 20:38:09 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-09 18:09:40 +0200 |
| commit | 74424224fd22d26dc9560445459c32c8a321d971 (patch) | |
| tree | 2156e6dbd2a4e2de5dbf5a6bef5eb427bfa5cb57 | |
| parent | 5df544acc2a346064ac0186cb9c2485c0b331afd (diff) | |
| download | nixpkgs-74424224fd22d26dc9560445459c32c8a321d971.tar nixpkgs-74424224fd22d26dc9560445459c32c8a321d971.tar.gz nixpkgs-74424224fd22d26dc9560445459c32c8a321d971.tar.bz2 nixpkgs-74424224fd22d26dc9560445459c32c8a321d971.tar.lz nixpkgs-74424224fd22d26dc9560445459c32c8a321d971.tar.xz nixpkgs-74424224fd22d26dc9560445459c32c8a321d971.tar.zst nixpkgs-74424224fd22d26dc9560445459c32c8a321d971.zip | |
shadow: fix build with libxcrypt
| -rw-r--r-- | pkgs/os-specific/linux/shadow/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 5537f9f6aac..c6fd417d0d6 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt , libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell -, pam ? null, glibcCross ? null +, libxcrypt, pam ? null, glibcCross ? null }: let @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-PxLX5V0t18JftT5wT41krNv18Ew7Kz3MfZkOi/80ODA="; }; - buildInputs = lib.optional (pam != null && stdenv.isLinux) pam; + buildInputs = [ libxcrypt ] + ++ lib.optional (pam != null && stdenv.isLinux) pam; nativeBuildInputs = [autoreconfHook libxslt libxml2 docbook_xml_dtd_45 docbook_xsl flex bison itstool ]; @@ -62,6 +63,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" "--with-group-name-max-length=32" + "--with-bcrypt" + "--with-yescrypt" ] ++ lib.optional (stdenv.hostPlatform.libc != "glibc") "--disable-nscd"; preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") |