diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-30 17:46:21 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-30 17:46:21 +0100 |
| commit | 1828a5c5ba465b7f342568c6a245a042831ef54c (patch) | |
| tree | 3052eb1b293c7655d9ea58d78aa81d0bf2c1d539 /pkgs/tools/networking | |
| parent | 70f5d64cb359a8e4351a32f24d68b8a8e0227b76 (diff) | |
| parent | 74e283403c9f10504c1d2ab8c4970289c81a482b (diff) | |
| download | nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.gz nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.bz2 nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.lz nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.xz nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.tar.zst nixlib-1828a5c5ba465b7f342568c6a245a042831ef54c.zip | |
Merge master into staging-next
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" ]; |