diff --git a/pkgs/by-name/x1/x11_ssh_askpass/package.nix b/pkgs/by-name/x1/x11_ssh_askpass/package.nix index 86a17d34cb0c..5a3f0a0c3004 100644 --- a/pkgs/by-name/x1/x11_ssh_askpass/package.nix +++ b/pkgs/by-name/x1/x11_ssh_askpass/package.nix @@ -2,9 +2,10 @@ lib, stdenv, fetchurl, + fetchDebianPatch, + autoreconfHook, + pkg-config, xorg, - imake, - gccmakedep, }: stdenv.mkDerivation rec { @@ -21,10 +22,21 @@ stdenv.mkDerivation rec { sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; - nativeBuildInputs = [ - imake - gccmakedep + patches = [ + (fetchDebianPatch { + pname = "ssh-askpass"; + version = "1:1.2.4.1"; + debianRevision = "16"; + patch = "autotools.patch"; + hash = "sha256-S2tl0GeDia/ZuyXetPOsiu79kS9yLId7gUj3siw7pH4="; + }) ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ xorg.libX11 xorg.libXt @@ -32,20 +44,6 @@ stdenv.mkDerivation rec { xorg.libSM ]; - configureFlags = [ - "--with-app-defaults-dir=$out/etc/X11/app-defaults" - ]; - - dontUseImakeConfigure = true; - postConfigure = '' - xmkmf -a - ''; - - installTargets = [ - "install" - "install.man" - ]; - meta = with lib; { homepage = "https://github.com/sigmavirus24/x11-ssh-askpass"; description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";