mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-23 04:25:14 +00:00
Merge pull request #209111 from KAction/patch/v1/pkgsStatic.htop
This commit is contained in:
commit
dc475f5d3c
@ -2,7 +2,8 @@
|
|||||||
, ncurses
|
, ncurses
|
||||||
, IOKit
|
, IOKit
|
||||||
, sensorsSupport ? stdenv.isLinux, lm_sensors
|
, sensorsSupport ? stdenv.isLinux, lm_sensors
|
||||||
, systemdSupport ? stdenv.isLinux, systemd
|
, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
|
||||||
|
, systemd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert systemdSupport -> stdenv.isLinux;
|
assert systemdSupport -> stdenv.isLinux;
|
||||||
@ -33,8 +34,7 @@ stdenv.mkDerivation rec {
|
|||||||
postFixup =
|
postFixup =
|
||||||
let
|
let
|
||||||
optionalPatch = pred: so: lib.optionalString pred "patchelf --add-needed ${so} $out/bin/htop";
|
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 sensorsSupport "${lm_sensors}/lib/libsensors.so"}
|
||||||
${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"}
|
${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"}
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user