diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 20:09:45 +0100 |
| commit | c5881ec2c91da7bcb4b0299f5842019c70cb90f5 (patch) | |
| tree | 9efaa7fe9f326a04e98760f5b3f10f6f463905ce /pkgs/tools/networking | |
| parent | e6834171b930f6db3796a16785d7cbb3173541b1 (diff) | |
| parent | 095544187a8ed13f14356f5df7dbe0ecc059ceb5 (diff) | |
| download | nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.gz nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.bz2 nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.lz nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.xz nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.tar.zst nixlib-c5881ec2c91da7bcb4b0299f5842019c70cb90f5.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/x11-ssh-askpass/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 896a2ff4daaa..1b9d55349030 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, imake }: +{ stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }: stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; @@ -10,16 +10,16 @@ stdenv.mkDerivation { sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; - nativeBuildInputs = [ imake ]; + nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ xlibsWrapper ]; configureFlags = [ "--with-app-defaults-dir=$out/etc/X11/app-defaults" ]; - preBuild = '' - xmkmf - make includes + dontUseImakeConfigure = true; + postConfigure = '' + xmkmf -a ''; installTargets = [ "install" "install.man" ]; |