shadow: add runtime-shell.patch

This gets the right shell in the closure.

By default, shadow wants to pull in the bash we are building it with,
while we would prefer it used the runtime bash.
This commit is contained in:
Matthew Bauer 2020-03-11 16:51:10 -04:00 committed by Milan
parent 9e4a925caf
commit fbb26ab536
2 changed files with 19 additions and 1 deletions

View file

@ -1,5 +1,5 @@
{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt
, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison
, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell
, pam ? null, glibcCross ? null
}:
@ -38,8 +38,11 @@ stdenv.mkDerivation rec {
# Obtain XML resources from XML catalog (patch adapted from gtk-doc)
./respect-xml-catalog-files-var.patch
dots_in_usernames
./runtime-shell.patch
];
RUNTIME_SHELL = runtimeShell;
# The nix daemon often forbids even creating set[ug]id files.
postPatch =
''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
@ -77,6 +80,8 @@ stdenv.mkDerivation rec {
mv $out/bin/su $su/bin
'';
disallowedReferences = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.shellPackage;
meta = with lib; {
homepage = "https://github.com/shadow-maint";
description = "Suite containing authentication-related tools such as passwd and su";

View file

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index e4c6aaec..03883ad7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -682,7 +682,7 @@ if test "$enable_utmpx" = "yes"; then
[Define if utmpx should be used])
fi
-AC_DEFINE_UNQUOTED(SHELL, ["$SHELL"], [The default shell.])
+AC_DEFINE_UNQUOTED(SHELL, ["$RUNTIME_SHELL"], [The runtime shell.])
AM_GNU_GETTEXT_VERSION(0.16)
AM_GNU_GETTEXT([external], [need-ngettext])