Unverified Commit ff30c899 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

glibc: make crypt support optional 

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

pkgs/development/libraries/glibc/common.nix

+4 −1
Original line number Diff line number Diff line
@@ -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"

pkgs/development/libraries/glibc/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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,