diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-09-11 22:48:06 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-09-11 22:49:10 +0100 |
| commit | 71890f599565d204b7d1aef90bc7db93ee32df72 (patch) | |
| tree | c0c45e355e47936d211c6e559e31977e053bd568 /pkgs/os-specific/linux/audit | |
| parent | d370d9ee99c1ae8e7c5e71d2722309eb645fc3df (diff) | |
| download | nixpkgs-71890f599565d204b7d1aef90bc7db93ee32df72.tar nixpkgs-71890f599565d204b7d1aef90bc7db93ee32df72.tar.gz nixpkgs-71890f599565d204b7d1aef90bc7db93ee32df72.tar.bz2 nixpkgs-71890f599565d204b7d1aef90bc7db93ee32df72.tar.lz nixpkgs-71890f599565d204b7d1aef90bc7db93ee32df72.tar.xz nixpkgs-71890f599565d204b7d1aef90bc7db93ee32df72.tar.zst nixpkgs-71890f599565d204b7d1aef90bc7db93ee32df72.zip | |
audit: pull upstream fix for -fno-common compiler
Fixes build failure against upstream gcc (defaults -fno-common).
Diffstat (limited to 'pkgs/os-specific/linux/audit')
| -rw-r--r-- | pkgs/os-specific/linux/audit/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 6fa7ba28d8e..a7f17e44950 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -37,7 +37,14 @@ stdenv.mkDerivation rec { # TODO: Remove the musl patches when # https://github.com/linux-audit/audit-userspace/pull/25 # is available with the next release. - patches = [ ./patches/weak-symbols.patch ] + patches = [ + ./patches/weak-symbols.patch + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + url = "https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch"; + sha256 = "100xa1rzkv0mvhjbfgpfm72f7c4p68syflvgc3xm6pxgrqqmfq8h"; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl [ ( let patch = fetchpatch { |