Skip to content

[staging-next] Revert "util-linux: fix static build" #149530

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
veprbl merged 1 commit into from
Dec 19, 2021
Merged

[staging-next] Revert "util-linux: fix static build" #149530

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
15 changes: 1 addition & 14 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,11 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng
, ncurses ? null, pam, systemd ? null
, nlsSupport ? true
, audit ? null
}:

assert stdenv.hostPlatform.isStatic -> audit != null;

stdenv.mkDerivation rec {
pname = "util-linux";
version = "2.37.2";
Expand Down Expand Up @@ -60,17 +57,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ zlib pam libcap_ng ]
++ lib.filter (p: p != null) [ ncurses systemd ]
# not sure how util-linux is linking with linux-pam,
# probably just with a simplistic -lpam.
# linux-pam doesn't seem to have a .pc file so I can't
# add -laudit to the Requires.private.
# libaudit is also needed directly anyway cf login-utils/login.c
# and sys-utils/hwclock.c, not sure how we got it working
# without audit on dynamic builds.
++ lib.optionals stdenv.hostPlatform.isStatic [ audit ];

NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isStatic "-laudit";
++ lib.filter (p: p != null) [ ncurses systemd ];

doCheck = false; # "For development purpose only. Don't execute on production system!"

Expand Down