lastpass-cli: 1.2.1 -> 1.2.2

NixOS · Jan 6, 2018 · b2d2b37 · b2d2b37
1 parent 71dd57f
commit b2d2b37
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
@@ -1,32 +1,37 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }:
+{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig
+, bash-completion, openssl, curl, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "0nrsrd5cqyv2zydzzl1vryrnj1p0x17cx1rmrp4kmzh83bzgcfvv";
+    sha256 = "0041z2awpmwq2fk8lbgp4fcia0r6wss2csvq5bxps0cx7fq69wc1";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];
+
   buildInputs = [
-    openssl curl libxml2 asciidoc docbook_xsl libxslt
+    bash-completion curl openssl libxml2 libxslt
   ];
 
-  makeFlags = "PREFIX=$(out)";
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions"
+  ];
 
   installTargets = "install install-doc";
 
   meta = with lib; {
     description = "Stores, retrieves, generates, and synchronizes passwords securely";
     homepage    = "https://github.com/lastpass/lastpass-cli";
     license     = licenses.gpl2Plus;
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ cstrahan ];
   };
 }