glibc: make crypt support optional

The libcrypt library is going to be replaced with libxcrypt in packages
that require it.

+6 -2
+4 -1
pkgs/development/libraries/glibc/common.nix
··· 36 36 , withLinuxHeaders ? false 37 37 , profilingLibraries ? false 38 38 , withGd ? false 39 + , withLibcrypt ? false 39 40 , meta 40 41 , extraBuildInputs ? [] 41 42 , extraNativeBuildInputs ? [] ··· 183 184 # To avoid linking with -lgcc_s (dynamic link) 184 185 # so the glibc does not depend on its compiler store path 185 186 "libc_cv_as_needed=no" 186 - ] ++ lib.optional withGd "--with-gd"; 187 + ] 188 + ++ lib.optional withGd "--with-gd" 189 + ++ lib.optional (!withLibcrypt) "--disable-crypt"; 187 190 188 191 makeFlags = [ 189 192 "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
+2 -1
pkgs/development/libraries/glibc/default.nix
··· 2 2 , withLinuxHeaders ? true 3 3 , profilingLibraries ? false 4 4 , withGd ? false 5 + , withLibcrypt? false 5 6 , buildPackages 6 7 }: 7 8 ··· 16 17 callPackage ./common.nix { inherit stdenv; } { 17 18 pname = "glibc" + lib.optionalString withGd "-gd"; 18 19 19 - inherit withLinuxHeaders profilingLibraries withGd; 20 + inherit withLinuxHeaders profilingLibraries withGd withLibcrypt; 20 21 21 22 # Note: 22 23 # Things you write here override, and do not add to,