dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

util-linux: try to fix parallel build failures

Browse Source 
Difficult to know if these actually fix it, since it only happens
sometimes.

Link: https://github.com/NixOS/nixpkgs/pull/309805#issuecomment-2109348209
Link: https://lore.kernel.org/util-linux/87le4c1zm4.fsf@alyssa.is/

vcunat edit: only apply on some platforms for now,
balancing fixes and the amount of rebuild work on Hydra.
The rest is picked from PR #311988
This commit is contained in:
Vladimír Čunát 2024-05-17 17:35:26 +02:00
parent 6506918b88
commit cb8fa2b758
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, pkg-config
, zlib, shadow
, capabilitiesSupport ? stdenv.isLinux
, libcap_ng
, libxcrypt
@ -18,7 +19,11 @@
, memstreamHook
, gitUpdater
}:
let
# Temporarily avoid applying the patches on systems where already we have binaries
# (in particular x86_64-linux and aarch64-linux) as the package is a huge rebuild there.
avoidRebuild = stdenv.isLinux && stdenv.is64bit;
in
stdenv.mkDerivation rec {
pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal";
version = "2.40.1";
@ -30,6 +35,19 @@ stdenv.mkDerivation rec {
patches = [
./rtcwake-search-PATH-for-shutdown.patch
] ++ lib.optionals (!avoidRebuild) [
# Backports of patches that hopefully fix an intermittent parallel
# build failure.
(fetchpatch {
name = "pam_lastlog2:-drop-duplicate-assignment-pam_lastlog2_la_LDFLAGS.patch";
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=290748729dc3edf9ea1c680c8954441a5e367a44";
hash = "sha256-Hi+SrT8UovZyCWf6Jc7s3dc6YLyfOfgqohOEnc7aJq4=";
})
(fetchpatch {
name = "libuuid:-drop-duplicate-assignment-liuuid_la_LDFLAGS";
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=597e8b246ae31366514ead6cca240a09fe5e1528";
hash = "sha256-QCx3MD/57x2tV1SlJ79EYyxafhaEH4UC+Dt24DA6P8I=";
})
];
# We separate some of the utilities into their own outputs. This
@ -80,6 +98,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config installShellFiles ]
++ lib.optionals (!avoidRebuild) [ autoreconfHook gtk-doc ]
++ lib.optionals translateManpages [ po4a ];
buildInputs = [ zlib libxcrypt sqlite ]