Unverified Commit 8ac50fca authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

htop: replace `systemd` with `systemdLibs` (#463762)

parents 4350d4d8 52d6e24e

pkgs/by-name/ht/htop/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
  libnl,

  sensorsSupport ? stdenv.hostPlatform.isLinux,

  lm_sensors,

  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,

  systemd,

  systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,

  systemdLibs,

}:



assert systemdSupport -> stdenv.hostPlatform.isLinux;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "htop-dev";

    repo = "htop";

    rev = version;

    tag = version;

    hash = "sha256-fVqQwXbJus2IVE1Bzf3yJJpKK4qcZN/SCTX1XYkiHhU=";

  };
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec { 
    libnl

  ]

  ++ lib.optional sensorsSupport lm_sensors

  ++ lib.optional systemdSupport systemd;

  ++ lib.optional systemdSupport systemdLibs;



  configureFlags = [

    "--enable-unicode"
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec { 
    in

    lib.optionalString (!stdenv.hostPlatform.isStatic) ''

      ${optionalPatch sensorsSupport "${lib.getLib lm_sensors}/lib/libsensors.so"}

      ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"}

      ${optionalPatch systemdSupport "${systemdLibs}/lib/libsystemd.so"}

    '';



  meta = {