summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-08-24 19:35:08 +0000
committerRobin Gloster <mail@glob.in>2016-08-24 20:18:52 +0000
commitd8679e49576e0e4764042a596bbbe5c3688f7ada (patch)
tree9ad3d5b199f69db136e0fc973c0b8e32e5ed6cb4 /pkgs/tools/networking
parent35d836660f50ce1dad06fbd07cf5c4d2fa969780 (diff)
downloadnixlib-d8679e49576e0e4764042a596bbbe5c3688f7ada.tar
nixlib-d8679e49576e0e4764042a596bbbe5c3688f7ada.tar.gz
nixlib-d8679e49576e0e4764042a596bbbe5c3688f7ada.tar.bz2
nixlib-d8679e49576e0e4764042a596bbbe5c3688f7ada.tar.lz
nixlib-d8679e49576e0e4764042a596bbbe5c3688f7ada.tar.xz
nixlib-d8679e49576e0e4764042a596bbbe5c3688f7ada.tar.zst
nixlib-d8679e49576e0e4764042a596bbbe5c3688f7ada.zip
easyrsa: use autoreconfHook
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/easyrsa/2.x.nix16
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix
index 493243cf81c8..b33034515fb6 100644
--- a/pkgs/tools/networking/easyrsa/2.x.nix
+++ b/pkgs/tools/networking/easyrsa/2.x.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, autoconf, automake111x, makeWrapper
-, gnugrep, openssl}:
+{ stdenv, fetchurl, autoreconfHook, makeWrapper
+, gnugrep, openssl }:
 
 stdenv.mkDerivation rec {
   name = "easyrsa-2.2.0";
@@ -9,20 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";
   };
 
-  # Copy missing files and autoreconf
-  preConfigure = ''
-    cp ${automake111x}/share/automake/install-sh .
-    cp ${automake111x}/share/automake/missing .
-
-    autoreconf
-  '';
-
   preBuild = ''
     mkdir -p $out/share/easy-rsa
   '';
 
-  nativeBuildInputs = [ autoconf makeWrapper automake111x ];
-  buildInputs = [ gnugrep openssl];
+  nativeBuildInputs = [ autoreconfHook makeWrapper ];
+  buildInputs = [ gnugrep openssl ];
 
   # Make sane defaults and patch default config vars
   postInstall = ''