Commit 7b5ec190 authored by Bang Lee's avatar Bang Lee
Browse files

slstatus: move config logic inside and allow more options

parent 3d98b57f

pkgs/applications/misc/slstatus/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ 
  libX11,

  libXau,

  libXdmcp,

  conf ? null,

  patches ? [ ],

  config,

  conf ? config.slstatus.conf or null,

  patches ? config.slstatus.patches or [ ],

  extraLibs ? config.slstatus.extraLibs or [ ],

  # update script dependencies

  gitUpdater,

}:
@@ -40,7 +42,8 @@ stdenv.mkDerivation rec { 
    libX11

    libXau

    libXdmcp

  ];

  ]

  ++ extraLibs;



  installFlags = [ "PREFIX=$(out)" ];

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -4256,9 +4256,7 @@ with pkgs; 
    ocamlPackages = ocaml-ng.ocamlPackages_4_12;

  };



  slstatus = callPackage ../applications/misc/slstatus {

    conf = config.slstatus.conf or null;

  };

  slstatus = callPackage ../applications/misc/slstatus { };



  smpq = callPackage ../by-name/sm/smpq/package.nix {

    stormlib = stormlib.overrideAttrs (old: {