diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:54:10 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:54:10 -0800 |
commit | 8f45d18a71fec8f2585c01b94a8b653a8894da69 (patch) | |
tree | c85648d156b63779c38a743a9824534a23a06f47 /pkgs/tools/security | |
parent | 0ba740d26b3e851a181034d8650ece94163d0fae (diff) | |
parent | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (diff) | |
download | nixlib-8f45d18a71fec8f2585c01b94a8b653a8894da69.tar nixlib-8f45d18a71fec8f2585c01b94a8b653a8894da69.tar.gz nixlib-8f45d18a71fec8f2585c01b94a8b653a8894da69.tar.bz2 nixlib-8f45d18a71fec8f2585c01b94a8b653a8894da69.tar.lz nixlib-8f45d18a71fec8f2585c01b94a8b653a8894da69.tar.xz nixlib-8f45d18a71fec8f2585c01b94a8b653a8894da69.tar.zst nixlib-8f45d18a71fec8f2585c01b94a8b653a8894da69.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/mkpasswd/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/security/pcsclite/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/pcsctools/default.nix | 34 |
3 files changed, 33 insertions, 28 deletions
diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 8975ca4324d1..88aa71810dcf 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,30 +1,21 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, whois, perl }: -stdenv.mkDerivation rec { - name = "mkpasswd-${version}"; +stdenv.mkDerivation { + name = "mkpasswd-${whois.version}"; - version = "5.1.1"; + src = whois.src; - src = fetchFromGitHub { - owner = "rfc1036"; - repo = "whois"; - rev = "v${version}"; - sha256 = "026x8byx8pcpkdxca64368p0nlspk4phw18jg4p04di6cg6nc1m5"; - }; - - preConfigure = '' - substituteInPlace Makefile --replace "prefix = /usr" "prefix = $out" - ''; + buildInputs = [ perl ]; + preConfigure = whois.preConfigure; buildPhase = "make mkpasswd"; - installPhase = "make install-mkpasswd"; meta = with stdenv.lib; { homepage = http://packages.qa.debian.org/w/whois.html; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; - maintainers = [ maintainers.cstrahan ]; + maintainers = with maintainers; [ cstrahan fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 6ec0cb238641..dd33e68c1526 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }: +{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 }: stdenv.mkDerivation rec { name = "pcsclite-1.8.14"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "--enable-confdir=/etc" ]; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl python2 ]; buildInputs = [ udev dbus_libs ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 72e43f15fe62..59db6889a578 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,22 +1,36 @@ -{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, pcsclite }: +{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite +, wget, coreutils +, perl, pcscperl, Glib, Gtk2, Pango +}: -stdenv.mkDerivation rec { - name = "pcsc-tools-1.4.23"; +let deps = lib.makeSearchPath "bin" [ wget coreutils ]; + +in stdenv.mkDerivation rec { + name = "pcsc-tools-1.4.25"; src = fetchurl { - url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.23.tar.gz"; - sha256 = "1qjgvvvwhykmzn4js9s3rjnp9pbjc3sz4lb4d7i9kvr3xsv7pjk9"; + url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.gz"; + sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9"; }; buildInputs = [ udev dbus_libs perl pcsclite ]; - preBuild = '' - makeFlags=DESTDIR=$out - ''; + makeFlags = [ "DESTDIR=$(out)" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + + postInstall = '' + wrapProgram $out/bin/scriptor \ + --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}" + wrapProgram $out/bin/gscriptor \ + --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}" + wrapProgram $out/bin/ATR_analysis \ + --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}" + wrapProgram $out/bin/pcsc_scan \ + --set PATH "$out/bin:${deps}" + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools used to test a PC/SC driver, card or reader"; homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/; license = licenses.gpl2Plus; |