From 8bd8c09f98ece814185a0e9b0285ac3c5e51d062 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 7 Aug 2018 12:07:03 +0200 Subject: x11_ssh_askpass: clean up & add man page --- pkgs/tools/networking/x11-ssh-askpass/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 1075e4616186c..4061d5284aa66 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,20 +1,28 @@ -{stdenv, fetchurl, xlibsWrapper, imake}: +{ stdenv, fetchurl, xlibsWrapper, imake }: stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; + outputs = [ "out" "man" ]; + src = fetchurl { url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz; sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7"; }; - preConfigure = " - configureFlags=\"--with-app-defaults-dir=$out/etc/X11/app-defaults\" - "; + nativeBuildInputs = [ imake ]; + buildInputs = [ xlibsWrapper ]; + + configureFlags = [ + "--with-app-defaults-dir=$out/etc/X11/app-defaults" + ]; - buildPhase = "xmkmf; make includes; make"; + preBuild = '' + xmkmf + make includes + ''; - buildInputs = [xlibsWrapper imake]; + installTargets = [ "install" "install.man" ]; meta = { homepage = http://www.jmknoble.net/software/x11-ssh-askpass/; -- cgit 1.4.1