Skip to content

[staging-next] pkgsMusl.procps: fix build #204212

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

Merged
yu-re-ka merged 1 commit into from
Dec 3, 2022
Merged

[staging-next] pkgsMusl.procps: fix build #204212

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
11 changes: 11 additions & 0 deletions pkgs/os-specific/linux/procps-ng/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
, fetchurl
, ncurses
, pkg-config
, fetchpatch

# `ps` with systemd support is able to properly report different
# attributes like unit name, so we want to have it on linux.
Expand All @@ -26,6 +27,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-RRiz56r9NOwH0AY9JQ/UdJmbILIAIYw65W9dIRPxQbQ=";
};

patches = lib.optionals stdenv.hostPlatform.isMusl [
# NOTE: Starting from 4.x we will not need a patch anymore, but need to add
# "--disable-w" to configureFlags instead to prevent the utmp errors
(fetchpatch {
name = "musl-fix-includes.patch";
url = "https://git.alpinelinux.org/aports/plain/main/procps/musl-fixes.patch?id=37cb5b6ef194db66d9ed07c8ecab59bca3b91215";
sha256 = "sha256-DphAvESmVg1U3bJABU95R++QD34odStCl82EF0vmht0=";
})
];

buildInputs = [ ncurses ]
++ lib.optional withSystemd systemd;
nativeBuildInputs = [ pkg-config ];
Expand Down