diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-12-03 11:12:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-03 11:12:29 -0500 |
| commit | b92067592be6d8a7db67ddac4adf82af76fc5e7d (patch) | |
| tree | c19f0ce46651f5f27b2189141cb5da5f5a69cb85 /pkgs/os-specific/linux/shadow | |
| parent | 8deedf1ffb276f5d75f5b60c4f08a3e0b12ff9e0 (diff) | |
| parent | 2730bc7f8df767a13dfeb63ca5293f03c5b89fe9 (diff) | |
Merge pull request #271756 from trofi/shadow-clang-fix
shadow: backport `clang-16` build fix
Diffstat (limited to 'pkgs/os-specific/linux/shadow')
| -rw-r--r-- | pkgs/os-specific/linux/shadow/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index f52342f5af366..d6319fd0dcf31 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , runtimeShell, nixosTests , autoreconfHook, bison, flex , docbook_xml_dtd_45, docbook_xsl @@ -47,6 +47,13 @@ stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch ./runtime-shell.patch ./fix-install-with-tcb.patch + # Fix build against `clang-16` and upcoming `gcc-14`: + # https://github.com/shadow-maint/shadow/pull/857 + (fetchpatch { + name = "fix-implicit-getdef_bool.patch"; + url = "https://github.com/shadow-maint/shadow/commit/5abe0811b880208600f646356549b7e5cad89060.patch"; + hash = "sha256-XqvVv8mYY58uXJBKRwncHQRSI45PUkp3dQNn44gzezU="; + }) ]; # The nix daemon often forbids even creating set[ug]id files. |