From ce0e3eae665cad3e7265177ab9d1f4b7989a40d4 Mon Sep 17 00:00:00 2001 From: Roman Joost Date: Fri, 18 Jun 2021 18:30:13 +1000 Subject: xlockmore: add preConfigure to compile with DPMS support (#127051) The build of xlockmore produced only the minimum set of features. DPMS support, Xinerama etc was disabled because the changes in the postPatch step were never applied by re-running autoconf. Furthermore, DPMS was not supported because it couldn't find the `dpms.h` header file in order to compile the support for DPMS features. This patch uses the `autoreconfHook` in which we run `autoconf` to apply the changes of `configure.ac` to the `configure` script. The patch also uses the `libXext.dev` `buildInput` in order to allow access to the right header files. --- pkgs/misc/screensavers/xlockmore/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/misc/screensavers/xlockmore/default.nix') diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 17b22ce072343..600528a794449 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pam ? null, libX11, libXext, libXinerama -, libXdmcp, libXt }: +, libXdmcp, libXt, autoreconfHook }: stdenv.mkDerivation rec { name = "xlockmore-5.66"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { }; # Optionally, it can use GTK. - buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ]; + buildInputs = [ pam libX11 libXext.dev libXinerama libXdmcp libXt ]; + nativeBuildInputs = [ autoreconfHook ]; # Don't try to install `xlock' setuid. Password authentication works # fine via PAM without super user privileges. -- cgit 1.4.1