colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibc: make crypt support optional

Browse Source 
The libcrypt library is going to be replaced with libxcrypt in packages
that require it.
This commit is contained in:
Martin Weinelt 2022-07-16 22:42:23 +02:00
parent 3e675d06f5
commit ff30c899d8
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glibc/common.nix
View File

@ -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"

3
pkgs/development/libraries/glibc/default.nix
View File

@ -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,