diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2017-01-19 15:11:23 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@higgsboson.tk> | 2017-01-19 15:13:38 +0100 |
| commit | 104a37a9fbd101de63562b8560e27e843887fe9f (patch) | |
| tree | 9ee380e6e2adf255bcc79ec6f5b03098b51d20af | |
| parent | 4b9b1fa9456b0858244fc5ba36cfbc71944cad75 (diff) | |
| download | nixlib-104a37a9fbd101de63562b8560e27e843887fe9f.tar nixlib-104a37a9fbd101de63562b8560e27e843887fe9f.tar.gz nixlib-104a37a9fbd101de63562b8560e27e843887fe9f.tar.bz2 nixlib-104a37a9fbd101de63562b8560e27e843887fe9f.tar.lz nixlib-104a37a9fbd101de63562b8560e27e843887fe9f.tar.xz nixlib-104a37a9fbd101de63562b8560e27e843887fe9f.tar.zst nixlib-104a37a9fbd101de63562b8560e27e843887fe9f.zip | |
util-linux: improve purity by using login from shadow
replacing shutdown in postPatch phase is not necessary as rtcwake was already patched to use the search path (the only user of shutdown)
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index a97ce920533c..f7f60e8997fa 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch +{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow , ncurses ? null, perl ? null, pam, systemd, minimal ? false }: stdenv.mkDerivation rec { @@ -17,12 +17,9 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - #FIXME: make it also work on non-nixos? postPatch = '' - # Substituting store paths would create a circular dependency on systemd substituteInPlace include/pathnames.h \ - --replace "/bin/login" "/run/current-system/sw/bin/login" \ - --replace "/sbin/shutdown" "/run/current-system/sw/bin/shutdown" + --replace "/bin/login" "${shadow}/bin/login" ''; crossAttrs = { |