diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-12-08 05:20:43 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-12-08 05:42:08 +0000 |
commit | 4809bd5bd0b101e544715a9c2b86a7306582ab5c (patch) | |
tree | 02594610b7bf019be3233a92fa1e654750322e73 /pkgs/os-specific/linux/util-linux/default.nix | |
parent | dc2fcd9f02c2a520e9167f2b505f579d9edeba6a (diff) | |
download | nixpkgs-4809bd5bd0b101e544715a9c2b86a7306582ab5c.tar nixpkgs-4809bd5bd0b101e544715a9c2b86a7306582ab5c.tar.gz nixpkgs-4809bd5bd0b101e544715a9c2b86a7306582ab5c.tar.bz2 nixpkgs-4809bd5bd0b101e544715a9c2b86a7306582ab5c.tar.lz nixpkgs-4809bd5bd0b101e544715a9c2b86a7306582ab5c.tar.xz nixpkgs-4809bd5bd0b101e544715a9c2b86a7306582ab5c.tar.zst nixpkgs-4809bd5bd0b101e544715a9c2b86a7306582ab5c.zip |
Revert "util-linux: fix static build"
This reverts commit 1f0ef842ca88a57613faf1ef4cd9a5d4e77efd81. The underlying issue was fixed in 2ebeb02a99a ("stdenv/setup: tell libtool about library paths"), so we don't need a workaround in util-linux any more.
Diffstat (limited to 'pkgs/os-specific/linux/util-linux/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index b3536e038f0..0818d7bde79 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -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"; @@ -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!" |