From 733cc23a1b5f38982623aeb1ff35213d62aacab4 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Tue, 18 Apr 2017 19:19:52 +0900 Subject: slock: add configFile support fixes #24994 --- pkgs/misc/screensavers/slock/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 2f20943981a5..2a2be06fde6a 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,13 +1,27 @@ -{ stdenv, fetchurl, xproto, libX11, libXext, libXrandr }: +{ stdenv, lib, fetchurl, writeText +, xproto, libX11, libXext, libXrandr +# default header can be obtained from +# http://git.suckless.org/slock/tree/config.def.h +, conf ? null }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "slock-1.4"; + src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"; }; + buildInputs = [ xproto libX11 libXext libXrandr ]; + installFlags = "DESTDIR=\${out} PREFIX="; - meta = with stdenv.lib; { + + preBuild = optionalString (conf != null) '' + cp ${writeText "config.def.h" conf} config.def.h + ''; + + meta = { homepage = http://tools.suckless.org/slock; description = "Simple X display locker"; longDescription = '' -- cgit 1.4.1