about summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-29 19:36:25 -0600
committerGitHub <noreply@github.com>2018-11-29 19:36:25 -0600
commit76c7a8bac083522ea10ba43f699421ca64007708 (patch)
treecc017b17548488b04a0506c1f3c00801839abb75 /pkgs/tools/networking
parentf435272ce351ed192e9ff9c643331a4cc063930e (diff)
parentc0a804c747c6909c036da76472393b2fbd6413b9 (diff)
downloadnixlib-76c7a8bac083522ea10ba43f699421ca64007708.tar
nixlib-76c7a8bac083522ea10ba43f699421ca64007708.tar.gz
nixlib-76c7a8bac083522ea10ba43f699421ca64007708.tar.bz2
nixlib-76c7a8bac083522ea10ba43f699421ca64007708.tar.lz
nixlib-76c7a8bac083522ea10ba43f699421ca64007708.tar.xz
nixlib-76c7a8bac083522ea10ba43f699421ca64007708.tar.zst
nixlib-76c7a8bac083522ea10ba43f699421ca64007708.zip
Merge pull request #51205 from matthewbauer/more-setup-hooks
Add premake & imake setup hook
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/x11-ssh-askpass/default.nix10
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" ];