Merge pull request #271756 from trofi/shadow-clang-fix

shadow: backport `clang-16` build fix
This commit is contained in:
Mario Rodas 2023-12-03 11:12:29 -05:00 committed by GitHub
commit b92067592b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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