Unverified Commit 71d96069 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #314687 from uninsane/pr-pam-formatting 

pam: packaging cleanups
parents 2cea0c50 b8031896

pkgs/os-specific/linux/pam/default.nix

+2 −10
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec { 
  ];



  # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569

  postPatch = if stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform then ''

  postPatch = lib.optionalString (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform) ''

    rm CHANGELOG

    touch ChangeLog

  '' else null;

  '';



  outputs = [ "out" "doc" "man" /* "modules" */ ];
@@ -36,14 +36,6 @@ stdenv.mkDerivation rec { 


  enableParallelBuilding = true;



  preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''

      # export ac_cv_search_crypt=no

      # (taken from Alpine linux, apparently insecure but also doesn't build O:))

      # disable insecure modules

      # sed -e 's/pam_rhosts//g' -i modules/Makefile.am

      sed -e 's/pam_rhosts//g' -i modules/Makefile.in

  '';



  configureFlags = [

    "--includedir=${placeholder "out"}/include/security"

    "--enable-sconfigdir=/etc/security"