diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-08 19:27:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-08 19:27:24 +0000 |
commit | 27831cbd866c75f9cd7463537ca2dfe21938a78a (patch) | |
tree | 56d65cfe36a26dcd6ec642567c81b13835ee40a5 /pkgs | |
parent | 01018567653aaa58bedf6f7ca6a02c6d50910075 (diff) | |
parent | 2b409cc7c3cd2d71f6890b93c3c40e83c3cc52fb (diff) | |
download | nixlib-27831cbd866c75f9cd7463537ca2dfe21938a78a.tar nixlib-27831cbd866c75f9cd7463537ca2dfe21938a78a.tar.gz nixlib-27831cbd866c75f9cd7463537ca2dfe21938a78a.tar.bz2 nixlib-27831cbd866c75f9cd7463537ca2dfe21938a78a.tar.lz nixlib-27831cbd866c75f9cd7463537ca2dfe21938a78a.tar.xz nixlib-27831cbd866c75f9cd7463537ca2dfe21938a78a.tar.zst nixlib-27831cbd866c75f9cd7463537ca2dfe21938a78a.zip |
Merge pull request #31397 from nico202/reaver-upgrade
reaver-wps-t6x: 1.5.2 -> 1.6.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/reaver-wps-t6x/default.nix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 2f0e19b231c0..dd8347717319 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -1,33 +1,24 @@ -{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps, makeWrapper }: +{ stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.6.3"; name = "reaver-wps-t6x-${version}"; - confdir = "/var/db/${name}"; # the sqlite database is at "${confdir}/reaver/reaver.db" src = fetchFromGitHub { owner = "t6x"; repo = "reaver-wps-fork-t6x"; rev = "v${version}"; - sha256 = "0zhlms89ncqz1f1hc22yw9x1s837yv76f1zcjizhgn5h7vp17j4b"; + sha256 = "1bccwp67q1q0h5m38gqxn9imq5rb75jbmv7fjr2n38v10jcga2pb"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libpcap sqlite pixiewps ]; + buildInputs = [ libpcap pixiewps ]; - setSourceRoot = '' - sourceRoot=$(echo */src) - ''; - - configureFlags = "--sysconfdir=${confdir}"; + preConfigure = "cd src"; installPhase = '' - mkdir -p $out/{bin,etc} - cp reaver.db $out/etc/ + mkdir -p $out/bin cp reaver wash $out/bin/ - - wrapProgram $out/bin/reaver --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" - wrapProgram $out/bin/wash --run "[ -s ${confdir}/reaver/reaver.db ] || install -D $out/etc/reaver.db ${confdir}/reaver/reaver.db" ''; meta = with stdenv.lib; { |