Skip to content

util-linux: try to fix parallel build failures #311988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alyssais wants to merge 1 commit into from
Closed

util-linux: try to fix parallel build failures #311988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions pkgs/os-specific/linux/util-linux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -30,6 +31,19 @@ stdenv.mkDerivation rec {

patches = [
./rtcwake-search-PATH-for-shutdown.patch

# 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
Expand Down Expand Up @@ -79,7 +93,7 @@ stdenv.mkDerivation rec {
"usrsbin_execdir=${placeholder "bin"}/sbin"
];

nativeBuildInputs = [ pkg-config installShellFiles ]
nativeBuildInputs = [ autoreconfHook gtk-doc pkg-config installShellFiles ]
++ lib.optionals translateManpages [ po4a ];

buildInputs = [ zlib libxcrypt sqlite ]
Expand Down