From 92c119fb31c5d30e43bf35272396ad4559dc548d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 27 Nov 2018 20:17:05 -0600 Subject: [PATCH] xautolock: use imake setup hook --- pkgs/misc/screensavers/xautolock/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 0c1446f0672f..cce4b351c577 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto }: +{ stdenv, fetchurl, xlibsWrapper +, imake, gccmakedep, libXScrnSaver, scrnsaverproto }: stdenv.mkDerivation rec { name = "xautolock-2.2"; @@ -14,10 +15,13 @@ stdenv.mkDerivation rec { }) ]; NIX_CFLAGS_COMPILE = "-DSYSV"; - makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man"; - preBuild = "xmkmf"; + makeFlags = [ + "BINDIR=$(out)/bin" + "MANPATH=$(out)/share/man" + ]; installTargets = "install install.man"; - buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto]; + nativeBuildInputs = [ imake gccmakedep ]; + buildInputs = [ xlibsWrapper libXScrnSaver scrnsaverproto ]; meta = with stdenv.lib; { description = "A program that launches a given program when your X session has been idle for a given time."; homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;