glibc: make crypt support optional
The libcrypt library is going to be replaced with libxcrypt in packages that require it.
This commit is contained in:
parent
3e675d06f5
commit
ff30c899d8
|
@ -36,6 +36,7 @@
|
|||
, withLinuxHeaders ? false
|
||||
, profilingLibraries ? false
|
||||
, withGd ? false
|
||||
, withLibcrypt ? false
|
||||
, meta
|
||||
, extraBuildInputs ? []
|
||||
, extraNativeBuildInputs ? []
|
||||
|
@ -183,7 +184,9 @@ stdenv.mkDerivation ({
|
|||
# To avoid linking with -lgcc_s (dynamic link)
|
||||
# so the glibc does not depend on its compiler store path
|
||||
"libc_cv_as_needed=no"
|
||||
] ++ lib.optional withGd "--with-gd";
|
||||
]
|
||||
++ lib.optional withGd "--with-gd"
|
||||
++ lib.optional (!withLibcrypt) "--disable-crypt";
|
||||
|
||||
makeFlags = [
|
||||
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, withLinuxHeaders ? true
|
||||
, profilingLibraries ? false
|
||||
, withGd ? false
|
||||
, withLibcrypt? false
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
|
@ -16,7 +17,7 @@ in
|
|||
callPackage ./common.nix { inherit stdenv; } {
|
||||
pname = "glibc" + lib.optionalString withGd "-gd";
|
||||
|
||||
inherit withLinuxHeaders profilingLibraries withGd;
|
||||
inherit withLinuxHeaders profilingLibraries withGd withLibcrypt;
|
||||
|
||||
# Note:
|
||||
# Things you write here override, and do not add to,
|
||||
|
|
Loading…
Reference in a new issue