Merge pull request #209111 from KAction/patch/v1/pkgsStatic.htop
This commit is contained in:
commit
dc475f5d3c
|
@ -2,7 +2,8 @@
|
|||
, ncurses
|
||||
, IOKit
|
||||
, sensorsSupport ? stdenv.isLinux, lm_sensors
|
||||
, systemdSupport ? stdenv.isLinux, systemd
|
||||
, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
|
||||
, systemd
|
||||
}:
|
||||
|
||||
assert systemdSupport -> stdenv.isLinux;
|
||||
|
@ -33,8 +34,7 @@ stdenv.mkDerivation rec {
|
|||
postFixup =
|
||||
let
|
||||
optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop";
|
||||
in
|
||||
''
|
||||
in lib.optionalString (!stdenv.hostPlatform.isStatic) ''
|
||||
${optionalPatch sensorsSupport "${lm_sensors}/lib/libsensors.so"}
|
||||
${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"}
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue